Harmonize variable and function names

[bytemare]

Some variables and functions have different names between the spec and the POC. I suggest we use the same names for clarity.