[Jorge] Change view names to match the correct screens