Renaming and proper separation of acid/core stuff