Revisited namings, removed ugly object dependencies