Changing underscores to hyphens and fixing delegate hover.