Tweak module names used internally by build system

Signed-off-by: John Else <john.else@citrix.com>
Add .merlin

Signed-off-by: John Else <john.else@citrix.com>