changed names to make more appropriate