refactoring class and package identifiers