Fixed one last problem with names