Name uniqueness check & extension fix