FIX: Naming convention compliance