Cleaned up naming scheme