Move prefixes into naming