Fix name bug (partial)