Fix/Reimplementation of c93caf0f439199ce2b8693bc61bdda54cd2de40b

Remove 'Occurrences' postfix of functions in the Occurrences module
Minor cleanup