fixed some formatting and the namespace prefix of a few state entities.