Made attribute name more descriptive [MJ-521/MJ-522]