renames and ant fix