consistent function naming
adding autoload declarations