Rename some signals and group to be clearer