API Jbuilder fix + file name fixes