naming convention redesigned