name-base is now namebase