More specific naming conventions

More specific naming conventions.