Some renaming, fix warnings.