M: some naming cleanup. Propertyloader introduced.