Corrections to naming