Cleaned up the default naming scheme