Rubocop fixes
merge of name attribute