Renamed references to old name.
Fixed directive bugs.