Standardize hook names and general clean up

Added type hinting too

Change-Id: Ibb80faba9e596f5291ccf0cadbcf4e8e01b090c6