Naming and slight row tweak