Cleaned up naming