Fixing the initial names