[DEV] change name of message on entry and button ==> TODO: Think of naming