Add Name attribute/functionality with accompanying unit tests