fix naming issue and return message