Refactored big ideas naming conventions