Minor code clean up, Added Name and User api controllers