Some more function renaming

Dropped the '-after-' prefix in some function names