Fix: more consistent method names and remove unnecessary casts.