Naming scheme made consistent with the rest of the application