[IMP] Minor changes + file name convention