Cleans up naming.