Fixes from renaming has-class-p => has-class
Makes naming choice consistent.