Standarding naming for all utilities
Fixed all tests