Better type names