Changed naming scheme to avoid confusion