Fixing bad file naming from last commits