Module Name correction
Merge branch 'makefile-bug-fix' into 4_16