Fix module paths in recent additions

Module paths were missing the odsreg module name in recent additions.

Change-Id: I6e5031ab1783891f1541ea6c92701fa13bc0c615