add rename as statement start, remove extra spaces