Cleaned up names and added conditional freekbs2 require.