class renaming, change registry method names