change class, method and file names to reflect function