Module name change and some minor bug fixes.