some naming optimizations