Fix naming descrepency, correct null arg placement