Cleaned up naming.