[CONTINUUM-2193] o fix prepare build of multi-module projects o refactored a few variable names and methods