Make prefixes consistent on some signals and other cleanup