Changed method names to be more appropriate.