fix layout and action names