Simplify names

Fo @justinchan