Forgot to update usage of Primitives after swapping coordinates