changed module names according to conventions