HOPKINS: Some refactoring and renaming in GENIAL()