Elements renamed

mostly just changed to caps I think