changed some more naming conventions