name convention change and other changes