labels deprecated in some more files.
All tests pass. pep8 fixed