modified BASE_NAME