Cleaned up code naming