The getIdentifier() (now getName()) method was calling toCql(), now it
just returns the internal variable. Changed the member variable from
identifier to name. This makes if match the way it is used in the code.