Restructure name methods