Further column and table name adaptions
Rollback only if active