update avatar controllers for the new naming conventions