Clarified name prefixes
Added runtime extensions and mocks