Strived to improve naming (parameters and variables) in model.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>