renamed some methods and parameters to be more uniform