Refactored data class level variables with different naming convention