refactored constants/actions conventions