Move to standard verb- naming convention