changed to new naming convention (test and fix)