Update container naming conventions, update stop and rm functions
Update whitespace