refactoring of constants and activity names