Rename to human readable class names