Minor modifications to make locations validate name