Add basic support for naming