Cleaned up components names.