Name changes and bug fixes