core: remove some more parametrized module references. Issue #513
(cherry picked from commit 99325a1030b98753815edbea1c860f09f5d68f9d)