Fix errors due to naming differences!