Also renamed some functions (preserving old names as deprecated aliases)