Revert "Renamed all position to state"

This reverts commit 368c59612dae9e89e3fff97ce3c6d3c8dee7776b.