Update skeleton for new naming convetion