Query rename, boot cleanups.