naming and cleanup
rename fix for casing issue - also dont pull for unknown state