Fixed names

Names fixes