Standardized to slim naming scheme