Renamed package, split error decoration from handling