refactoring naming of classes to include "Squirt"