Added RNShapeSet class, updated method names to clearly state when using CG objects