Finish getting rid of namelength