Change them naming conventions

Woo!