Better naming, more key control