Improved some naming on the eventPage form