Rename lister, inline template classes