Changed naming strategy to all uppercase