Smallfix - Naming convention