Fixed names for UI classes