Generic naming and clean up