Fix some problems, rename objects