Use real guid, comment out and rename old static item elements