Refs #24 - Change name of class.