UI modification - changed names