Give Base a more representative name

Mark old hooks as deprecated