rename methods based on input from ribasushi