Fix/adminlist generator sf coding conventions