Rename Blame to Blameable and other fixes