More standard naming in the main file