Renamed methods named *2 in model to *.

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