Updated naming conventions, added shutdown