Cleaned up naming conventions