Fix modules so the versions are substituted

Need this applied to master and the 8.7.x branch.