I would prefer so — I don't want to create naming inconsistencies if possible