Fix identifiers problem and file name scheme