Fix name problem