renamed classes to match actual behavior
fixed improper commit