Make file namings stricter