changed a few names to avoid confusion