Fix deprecated variable naming in templates, fix module requirements and...

... re-format according to geppetto rules