Tidied up model names in forms