More weston rename fixes
7 files changed