added protocol definitions
cleaned up module names