Observed->Observable naming cleanup