renamed classes to match actual behavior