rename to using new standards. also fix dependencies in test module