Fixed custom name bug