merged from RefactorClassNames