tried to keep naming consistent
yeah compile errors fixed