Consistent naming after proof-reading