Minor attributes rename

minor changes attribute names, methods