From 55310062e8279fef5f1d395f9f110335cfbca347 Mon Sep 17 00:00:00 2001
From: John Stuart <john.stuart@bnymellon.com>
Date: Fri, 28 Jun 2024 14:29:26 -0400
Subject: [PATCH] Update brand to BNY

Signed-off-by: John Stuart <john.stuart@bnymellon.com>
---
 CONTRIBUTING.MD                               |  4 +-
 pom.xml                                       |  4 +-
 spring-boot-with-admin/admin/pom.xml          |  4 +-
 .../admin/SpringBootAdminApplication.java     |  4 +-
 .../admin/config/SecurityConfiguration.java   |  2 +-
 .../SpringBootAdminApplicationTests.java      |  4 +-
 spring-boot-with-admin/notification/pom.xml   |  4 +-
 .../notification/NotificationApplication.java |  6 +--
 .../controller/NotificationAPIContract.java   |  6 +--
 .../NotificationAPIContractImpl.java          |  8 +--
 .../spring/boot/notification/model/Todo.java  |  4 +-
 .../notification/model/response/Metadata.java |  4 +-
 .../notification/model/response/Status.java   |  4 +-
 .../response/TodoCollectionResponse.java      |  6 +--
 .../model/response/TodoResponse.java          |  4 +-
 .../service/NotificationService.java          |  6 +--
 .../service/NotificationServiceImpl.java      |  8 +--
 .../NotificationAPIContractTest.java          |  8 +--
 .../service/NotificationServiceTest.java      | 10 ++--
 spring-boot-with-admin/pom.xml                |  4 +-
 spring-boot-with-admin/registry/pom.xml       |  4 +-
 .../boot/registry/RegistryApplication.java    |  4 +-
 .../registry/RegistryApplicationTests.java    |  4 +-
 .../01_HowToCreateANewSpringBootProject.adoc  |  8 +--
 spring-boot/assets/docs/04_ModelLayer.adoc    |  4 +-
 spring-boot/assets/docs/05_DAOLayer.adoc      |  4 +-
 spring-boot/assets/docs/06_Exceptions.adoc    |  8 +--
 spring-boot/assets/docs/07_ServiceLayer.adoc  |  6 +--
 .../assets/docs/08_ControllerLayer.adoc       | 34 ++++++-------
 .../assets/docs/09_ProfilesConfiguration.adoc |  8 +--
 spring-boot/assets/docs/10_Documentation.adoc | 12 ++---
 spring-boot/assets/docs/11_APITests.adoc      |  2 +-
 spring-boot/todo/pom.xml                      |  4 +-
 .../spring/boot/todo/TodoApplication.java     |  6 +--
 .../spring/boot/todo/TodoConstants.java       |  4 +-
 .../ProfileConfigurationProperties.java       |  4 +-
 .../TodoDefaultServiceSwaggerConfig.java      | 10 ++--
 .../TodoDevelopmentServiceSwaggerConfig.java  | 10 ++--
 .../TodoProductionServiceSwaggerConfig.java   | 10 ++--
 .../boot/todo/controller/TodoAPIContract.java | 17 +++----
 .../todo/controller/TodoAPIContractImpl.java  | 28 +++++------
 .../todo/controller/TodoResponseHelper.java   |  8 +--
 .../spring/boot/todo/dao/TodoRepository.java  |  6 +--
 .../training/spring/boot/todo/model/Todo.java |  4 +-
 .../exception/InvalidAssigneeException.java   |  4 +-
 .../model/exception/InvalidIdException.java   |  4 +-
 .../exception/TodoNotFoundException.java      |  4 +-
 .../boot/todo/model/response/Issue.java       |  4 +-
 .../boot/todo/model/response/Metadata.java    |  4 +-
 .../boot/todo/model/response/Status.java      |  4 +-
 .../response/TodoCollectionResponse.java      |  6 +--
 .../model/response/TodoErrorResponse.java     |  4 +-
 .../todo/model/response/TodoResponse.java     |  4 +-
 .../model/response/TodoSuccessResponse.java   |  6 +--
 .../spring/boot/todo/service/TodoService.java |  6 +--
 .../boot/todo/service/TodoServiceImpl.java    | 16 +++---
 .../boot/todo/AbstractTodoMockSetupTest.java  | 14 +++---
 .../training/spring/boot/todo/DbTestUtil.java |  4 +-
 .../boot/todo/TodoApplicationTests.java       |  4 +-
 .../controller/TodoAPIContractRestTest.java   | 22 ++++----
 .../todo/controller/TodoAPIContractTest.java  | 18 +++----
 .../boot/todo/dao/TodoRepositoryTest.java     |  6 +--
 .../spring/boot/todo/model/TodoTest.java      |  4 +-
 .../boot/todo/model/response/IssueTest.java   |  4 +-
 .../todo/model/response/MetadataTest.java     |  4 +-
 .../boot/todo/model/response/StatusTest.java  |  4 +-
 .../response/TodoCollectionResponseTest.java  |  6 +--
 .../model/response/TodoErrorResponseTest.java |  4 +-
 .../response/TodoSuccessResponseTest.java     |  6 +--
 .../boot/todo/service/TodoServiceTest.java    | 15 +++---
 .../assets/docs/01_InversionOfControl.adoc    | 14 +++---
 .../assets/docs/02_DependencyInjection.adoc   | 50 +++++++++----------
 spring-framework/assets/docs/03_Testing.adoc  | 16 +++---
 .../assets/docs/04_PersistenceWithJDBC.adoc   | 14 +++---
 .../docs/05_PersistenceWithHibernate.adoc     | 26 +++++-----
 .../assets/docs/06_PersistenceWithJPA.adoc    | 12 ++---
 .../docs/07_PersistenceWithSpringDataJPA.adoc | 10 ++--
 .../ch01_spring-inversion-of-control/pom.xml  |  4 +-
 .../framework/Ex00_NoFrameworkExample.java    |  6 +--
 .../Ex01_InstantiationThroughConstructor.java |  7 ++-
 ...x02_InstantiationThroughStaticFactory.java |  6 +--
 ...3_InstantiationThroughInstanceFactory.java |  7 ++-
 .../spring/framework/model/ColoredShape.java  |  4 +-
 ...ex01-instantiation-through-constructor.xml |  2 +-
 ...2-instantiation-through-static-factory.xml |  2 +-
 ...instantiation-through-instance-factory.xml |  2 +-
 .../training/spring/framework/Lab01Test.java  | 11 ++--
 .../spring/framework/model/Vehicle.java       |  4 +-
 .../framework/model/VehicleFactory.java       |  4 +-
 .../ch02_spring-dependency-injection/pom.xml  |  4 +-
 .../framework/Ex00_NoFrameworkExample.java    | 12 ++---
 .../Ex05_DIThroughAnnotationSetters.java      |  7 ++-
 .../Ex06_DIThroughAnnotationConstructor.java  |  6 +--
 ...x07_DIThroughAnnotationWithQualifiers.java |  7 ++-
 .../framework/java/Ex08_DIThroughJava.java    |  8 +--
 .../java/Ex09_DIThroughJavaConfiguration.java | 10 ++--
 .../model/AutowiredColoredShapeHolder.java    |  4 +-
 .../spring/framework/model/BlackBox.java      |  4 +-
 .../spring/framework/model/ColoredShape.java  |  4 +-
 .../framework/model/ColoredShapeHolder.java   |  4 +-
 ...onstructorAnnotatedColoredShapeHolder.java |  4 +-
 ...rAnnotatedQualifiedColoredShapeHolder.java |  4 +-
 .../spring/framework/model/CyanCylinder.java  |  4 +-
 .../framework/model/DIConfiguration.java      |  4 +-
 .../spring/framework/model/OrangeOval.java    |  4 +-
 .../spring/framework/model/RedRectangle.java  |  4 +-
 .../SetterAnnotatedColoredShapeHolder.java    |  4 +-
 .../xml/Ex01_DIThroughConstructorSimple.java  |  7 ++-
 .../xml/Ex02_DIThroughConstructorNamed.java   |  7 ++-
 .../xml/Ex03_DIThroughConstructorIndex.java   |  7 ++-
 .../framework/xml/Ex04_DIThroughSetters.java  |  7 ++-
 .../ex01-di-through-constructor-simple.xml    |  4 +-
 .../ex02-di-through-constructor-named.xml     |  4 +-
 .../ex03-di-through-constructor-index.xml     |  4 +-
 .../resources/ex04-di-through-setters.xml     |  4 +-
 .../ex05-di-through-annotation-setters.xml    |  4 +-
 ...ex06-di-through-annotation-constructor.xml |  4 +-
 ...-di-through-annotation-with-qualifiers.xml |  6 +--
 .../framework/annotation/Lab02Test.java       |  9 ++--
 .../ConstructorAnnotatedBulkVehicleOrder.java |  4 +-
 ...nnotatedWithQualifierBulkVehicleOrder.java |  4 +-
 .../SetterAnnotatedBulkVehicleOrder.java      |  4 +-
 .../spring/framework/model/Vehicle.java       |  4 +-
 .../spring/framework/xml/Lab01Test.java       |  7 ++-
 spring-framework/ch03_spring-testing/pom.xml  |  4 +-
 .../spring/framework/model/ColoredShape.java  |  4 +-
 .../framework/model/ColoredShapeHolder.java   |  4 +-
 .../framework/model/DIConfiguration.java      |  6 +--
 .../Ex01_DefaultXMLContextConfiguration.java  |  6 +--
 .../Ex02_CustomXMLContextConfiguration.java   |  6 +--
 .../Ex03_JavaContextConfiguration.java        |  8 +--
 .../training/spring/framework/Lab01Test.java  |  8 ++-
 .../training/spring/framework/Lab02Test.java  |  7 ++-
 .../training/spring/framework/Lab03Test.java  |  7 ++-
 .../framework/model/BulkVehicleOrder.java     |  4 +-
 .../framework/model/Lab03DIConfiguration.java |  4 +-
 .../spring/framework/model/Vehicle.java       |  4 +-
 ...DefaultXMLContextConfiguration-context.xml |  4 +-
 .../src/test/resources/ex02.xml               |  4 +-
 .../ch04_spring-persistence/pom.xml           |  4 +-
 .../framework/Ex01_DB_XMLConfigured.java      |  8 +--
 .../framework/Ex02_DB_JavaConfigured.java     | 10 ++--
 .../spring/framework/dao/ColoredShapeDao.java |  6 +--
 .../dao/ColoredShapeDaoImplEx01.java          |  6 +--
 .../dao/ColoredShapeDaoImplEx02.java          |  6 +--
 .../spring/framework/model/ColoredShape.java  |  4 +-
 .../framework/model/DBConfiguration.java      |  4 +-
 .../src/main/resources/spring-config.xml      |  4 +-
 .../ch05_spring-hibernate/pom.xml             |  4 +-
 .../framework/ColoredShapeApplication.java    |  9 ++--
 .../framework/config/ColoredShapeConfig.java  |  6 +--
 .../config/HibernateSessionConfig.java        |  6 +--
 .../ColoredShapeControllingBean.java          |  8 +--
 .../spring/framework/dao/ColoredShapeDao.java |  6 +--
 .../framework/dao/ColoredShapeDaoImpl.java    |  7 ++-
 .../spring/framework/model/ColoredShape.java  |  4 +-
 .../service/ColoredShapeService.java          |  6 +--
 .../service/ColoredShapeServiceImpl.java      |  8 +--
 .../src/main/resources/logback.xml            |  2 +-
 spring-framework/ch06_spring-jpa/pom.xml      |  4 +-
 .../framework/ColoredShapeApplication.java    |  8 +--
 .../framework/config/ColoredShapeConfig.java  |  6 +--
 .../framework/config/HibernateJPAConfig.java  |  6 +--
 .../ColoredShapeControllingBean.java          |  9 ++--
 .../spring/framework/dao/ColoredShapeDao.java |  6 +--
 .../framework/dao/ColoredShapeDaoImpl.java    |  7 ++-
 .../spring/framework/model/ColoredShape.java  |  4 +-
 .../service/ColoredShapeService.java          |  6 +--
 .../service/ColoredShapeServiceImpl.java      |  9 ++--
 .../src/main/resources/logback.xml            |  2 +-
 spring-framework/ch07_spring-data-jpa/pom.xml |  4 +-
 .../framework/ColoredShapeApplication.java    |  8 +--
 .../framework/config/ColoredShapeConfig.java  |  6 +--
 .../framework/config/HibernateJPAConfig.java  |  8 +--
 .../ColoredShapeControllingBean.java          |  8 +--
 .../spring/framework/dao/ColoredShapeDao.java |  6 +--
 .../spring/framework/model/ColoredShape.java  |  4 +-
 .../service/ColoredShapeService.java          |  6 +--
 .../service/ColoredShapeServiceImpl.java      |  9 ++--
 .../src/main/resources/logback.xml            |  2 +-
 spring-framework/ch08_spring-rest/pom.xml     |  4 +-
 .../framework/ColoredShapeApplication.java    |  7 ++-
 .../framework/config/ColoredShapeConfig.java  |  4 +-
 .../framework/config/HibernateJPAConfig.java  |  6 +--
 .../controller/ColoredShapeController.java    |  6 +--
 .../spring/framework/dao/ColoredShapeDao.java |  5 +-
 .../spring/framework/model/ColoredShape.java  |  2 +-
 .../service/ColoredShapeService.java          |  4 +-
 .../service/ColoredShapeServiceImpl.java      |  6 +--
 .../src/main/resources/logback.xml            |  2 +-
 spring-framework/pom.xml                      |  4 +-
 191 files changed, 615 insertions(+), 644 deletions(-)
 rename spring-boot-with-admin/admin/src/main/java/{bnymellon => bny}/training/spring/boot/admin/SpringBootAdminApplication.java (91%)
 rename spring-boot-with-admin/admin/src/main/java/{bnymellon => bny}/training/spring/boot/admin/config/SecurityConfiguration.java (98%)
 rename spring-boot-with-admin/admin/src/test/java/{bnymellon => bny}/training/spring/boot/admin/SpringBootAdminApplicationTests.java (89%)
 rename spring-boot-with-admin/notification/src/main/java/{bnymellon => bny}/training/spring/boot/notification/NotificationApplication.java (82%)
 rename spring-boot-with-admin/notification/src/main/java/{bnymellon => bny}/training/spring/boot/notification/controller/NotificationAPIContract.java (90%)
 rename spring-boot-with-admin/notification/src/main/java/{bnymellon => bny}/training/spring/boot/notification/controller/NotificationAPIContractImpl.java (87%)
 rename spring-boot-with-admin/notification/src/main/java/{bnymellon => bny}/training/spring/boot/notification/model/Todo.java (97%)
 rename spring-boot-with-admin/notification/src/main/java/{bnymellon => bny}/training/spring/boot/notification/model/response/Metadata.java (98%)
 rename spring-boot-with-admin/notification/src/main/java/{bnymellon => bny}/training/spring/boot/notification/model/response/Status.java (96%)
 rename spring-boot-with-admin/notification/src/main/java/{bnymellon => bny}/training/spring/boot/notification/model/response/TodoCollectionResponse.java (93%)
 rename spring-boot-with-admin/notification/src/main/java/{bnymellon => bny}/training/spring/boot/notification/model/response/TodoResponse.java (83%)
 rename spring-boot-with-admin/notification/src/main/java/{bnymellon => bny}/training/spring/boot/notification/service/NotificationService.java (83%)
 rename spring-boot-with-admin/notification/src/main/java/{bnymellon => bny}/training/spring/boot/notification/service/NotificationServiceImpl.java (94%)
 rename spring-boot-with-admin/notification/src/test/java/{bnymellon => bny}/training/spring/boot/notification/controller/NotificationAPIContractTest.java (94%)
 rename spring-boot-with-admin/notification/src/test/java/{bnymellon => bny}/training/spring/boot/notification/service/NotificationServiceTest.java (94%)
 rename spring-boot-with-admin/registry/src/main/java/{bnymellon => bny}/training/spring/boot/registry/RegistryApplication.java (90%)
 rename spring-boot-with-admin/registry/src/test/java/{bnymellon => bny}/training/spring/boot/registry/RegistryApplicationTests.java (88%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/TodoApplication.java (83%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/TodoConstants.java (91%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/config/ProfileConfigurationProperties.java (92%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/config/TodoDefaultServiceSwaggerConfig.java (86%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/config/TodoDevelopmentServiceSwaggerConfig.java (86%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/config/TodoProductionServiceSwaggerConfig.java (86%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/controller/TodoAPIContract.java (95%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/controller/TodoAPIContractImpl.java (91%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/controller/TodoResponseHelper.java (88%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/dao/TodoRepository.java (89%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/model/Todo.java (98%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/model/exception/InvalidAssigneeException.java (87%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/model/exception/InvalidIdException.java (87%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/model/exception/TodoNotFoundException.java (87%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/model/response/Issue.java (96%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/model/response/Metadata.java (98%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/model/response/Status.java (96%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/model/response/TodoCollectionResponse.java (94%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/model/response/TodoErrorResponse.java (96%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/model/response/TodoResponse.java (84%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/model/response/TodoSuccessResponse.java (93%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/service/TodoService.java (85%)
 rename spring-boot/todo/src/main/java/{bnymellon => bny}/training/spring/boot/todo/service/TodoServiceImpl.java (87%)
 rename spring-boot/todo/src/test/java/{bnymellon => bny}/training/spring/boot/todo/AbstractTodoMockSetupTest.java (92%)
 rename spring-boot/todo/src/test/java/{bnymellon => bny}/training/spring/boot/todo/DbTestUtil.java (97%)
 rename spring-boot/todo/src/test/java/{bnymellon => bny}/training/spring/boot/todo/TodoApplicationTests.java (89%)
 rename spring-boot/todo/src/test/java/{bnymellon => bny}/training/spring/boot/todo/controller/TodoAPIContractRestTest.java (96%)
 rename spring-boot/todo/src/test/java/{bnymellon => bny}/training/spring/boot/todo/controller/TodoAPIContractTest.java (91%)
 rename spring-boot/todo/src/test/java/{bnymellon => bny}/training/spring/boot/todo/dao/TodoRepositoryTest.java (96%)
 rename spring-boot/todo/src/test/java/{bnymellon => bny}/training/spring/boot/todo/model/TodoTest.java (97%)
 rename spring-boot/todo/src/test/java/{bnymellon => bny}/training/spring/boot/todo/model/response/IssueTest.java (95%)
 rename spring-boot/todo/src/test/java/{bnymellon => bny}/training/spring/boot/todo/model/response/MetadataTest.java (97%)
 rename spring-boot/todo/src/test/java/{bnymellon => bny}/training/spring/boot/todo/model/response/StatusTest.java (95%)
 rename spring-boot/todo/src/test/java/{bnymellon => bny}/training/spring/boot/todo/model/response/TodoCollectionResponseTest.java (96%)
 rename spring-boot/todo/src/test/java/{bnymellon => bny}/training/spring/boot/todo/model/response/TodoErrorResponseTest.java (97%)
 rename spring-boot/todo/src/test/java/{bnymellon => bny}/training/spring/boot/todo/model/response/TodoSuccessResponseTest.java (96%)
 rename spring-boot/todo/src/test/java/{bnymellon => bny}/training/spring/boot/todo/service/TodoServiceTest.java (93%)
 rename spring-framework/ch01_spring-inversion-of-control/src/main/java/{bnymellon => bny}/training/spring/framework/Ex00_NoFrameworkExample.java (88%)
 rename spring-framework/ch01_spring-inversion-of-control/src/main/java/{bnymellon => bny}/training/spring/framework/Ex01_InstantiationThroughConstructor.java (88%)
 rename spring-framework/ch01_spring-inversion-of-control/src/main/java/{bnymellon => bny}/training/spring/framework/Ex02_InstantiationThroughStaticFactory.java (90%)
 rename spring-framework/ch01_spring-inversion-of-control/src/main/java/{bnymellon => bny}/training/spring/framework/Ex03_InstantiationThroughInstanceFactory.java (90%)
 rename spring-framework/ch01_spring-inversion-of-control/src/main/java/{bnymellon => bny}/training/spring/framework/model/ColoredShape.java (93%)
 rename spring-framework/ch01_spring-inversion-of-control/src/test/java/{bnymellon => bny}/training/spring/framework/Lab01Test.java (92%)
 rename spring-framework/ch01_spring-inversion-of-control/src/test/java/{bnymellon => bny}/training/spring/framework/model/Vehicle.java (92%)
 rename spring-framework/ch01_spring-inversion-of-control/src/test/java/{bnymellon => bny}/training/spring/framework/model/VehicleFactory.java (89%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/Ex00_NoFrameworkExample.java (86%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/annotation/Ex05_DIThroughAnnotationSetters.java (85%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/annotation/Ex06_DIThroughAnnotationConstructor.java (86%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/annotation/Ex07_DIThroughAnnotationWithQualifiers.java (86%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/java/Ex08_DIThroughJava.java (84%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/java/Ex09_DIThroughJavaConfiguration.java (78%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/model/AutowiredColoredShapeHolder.java (95%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/model/BlackBox.java (88%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/model/ColoredShape.java (93%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/model/ColoredShapeHolder.java (93%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/model/ConstructorAnnotatedColoredShapeHolder.java (95%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/model/ConstructorAnnotatedQualifiedColoredShapeHolder.java (95%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/model/CyanCylinder.java (87%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/model/DIConfiguration.java (92%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/model/OrangeOval.java (89%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/model/RedRectangle.java (87%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/model/SetterAnnotatedColoredShapeHolder.java (94%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/xml/Ex01_DIThroughConstructorSimple.java (87%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/xml/Ex02_DIThroughConstructorNamed.java (87%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/xml/Ex03_DIThroughConstructorIndex.java (87%)
 rename spring-framework/ch02_spring-dependency-injection/src/main/java/{bnymellon => bny}/training/spring/framework/xml/Ex04_DIThroughSetters.java (86%)
 rename spring-framework/ch02_spring-dependency-injection/src/test/java/{bnymellon => bny}/training/spring/framework/annotation/Lab02Test.java (90%)
 rename spring-framework/ch02_spring-dependency-injection/src/test/java/{bnymellon => bny}/training/spring/framework/model/ConstructorAnnotatedBulkVehicleOrder.java (93%)
 rename spring-framework/ch02_spring-dependency-injection/src/test/java/{bnymellon => bny}/training/spring/framework/model/ConstructorAnnotatedWithQualifierBulkVehicleOrder.java (94%)
 rename spring-framework/ch02_spring-dependency-injection/src/test/java/{bnymellon => bny}/training/spring/framework/model/SetterAnnotatedBulkVehicleOrder.java (93%)
 rename spring-framework/{ch03_spring-testing/src/test/java/bnymellon => ch02_spring-dependency-injection/src/test/java/bny}/training/spring/framework/model/Vehicle.java (92%)
 rename spring-framework/ch02_spring-dependency-injection/src/test/java/{bnymellon => bny}/training/spring/framework/xml/Lab01Test.java (93%)
 rename spring-framework/ch03_spring-testing/src/main/java/{bnymellon => bny}/training/spring/framework/model/ColoredShape.java (93%)
 rename spring-framework/ch03_spring-testing/src/main/java/{bnymellon => bny}/training/spring/framework/model/ColoredShapeHolder.java (93%)
 rename spring-framework/ch03_spring-testing/src/main/java/{bnymellon => bny}/training/spring/framework/model/DIConfiguration.java (90%)
 rename spring-framework/ch03_spring-testing/src/test/java/{bnymellon => bny}/training/spring/framework/Ex01_DefaultXMLContextConfiguration.java (90%)
 rename spring-framework/ch03_spring-testing/src/test/java/{bnymellon => bny}/training/spring/framework/Ex02_CustomXMLContextConfiguration.java (90%)
 rename spring-framework/ch03_spring-testing/src/test/java/{bnymellon => bny}/training/spring/framework/Ex03_JavaContextConfiguration.java (90%)
 rename spring-framework/ch03_spring-testing/src/test/java/{bnymellon => bny}/training/spring/framework/Lab01Test.java (86%)
 rename spring-framework/ch03_spring-testing/src/test/java/{bnymellon => bny}/training/spring/framework/Lab02Test.java (90%)
 rename spring-framework/ch03_spring-testing/src/test/java/{bnymellon => bny}/training/spring/framework/Lab03Test.java (93%)
 rename spring-framework/ch03_spring-testing/src/test/java/{bnymellon => bny}/training/spring/framework/model/BulkVehicleOrder.java (93%)
 rename spring-framework/ch03_spring-testing/src/test/java/{bnymellon => bny}/training/spring/framework/model/Lab03DIConfiguration.java (88%)
 rename spring-framework/{ch02_spring-dependency-injection/src/test/java/bnymellon => ch03_spring-testing/src/test/java/bny}/training/spring/framework/model/Vehicle.java (92%)
 rename spring-framework/ch04_spring-persistence/src/main/java/{bnymellon => bny}/training/spring/framework/Ex01_DB_XMLConfigured.java (88%)
 rename spring-framework/ch04_spring-persistence/src/main/java/{bnymellon => bny}/training/spring/framework/Ex02_DB_JavaConfigured.java (84%)
 rename spring-framework/ch04_spring-persistence/src/main/java/{bnymellon => bny}/training/spring/framework/dao/ColoredShapeDao.java (88%)
 rename spring-framework/ch04_spring-persistence/src/main/java/{bnymellon => bny}/training/spring/framework/dao/ColoredShapeDaoImplEx01.java (94%)
 rename spring-framework/ch04_spring-persistence/src/main/java/{bnymellon => bny}/training/spring/framework/dao/ColoredShapeDaoImplEx02.java (95%)
 rename spring-framework/ch04_spring-persistence/src/main/java/{bnymellon => bny}/training/spring/framework/model/ColoredShape.java (94%)
 rename spring-framework/ch04_spring-persistence/src/main/java/{bnymellon => bny}/training/spring/framework/model/DBConfiguration.java (93%)
 rename spring-framework/{ch07_spring-data-jpa/src/main/java/bnymellon => ch05_spring-hibernate/src/main/java/bny}/training/spring/framework/ColoredShapeApplication.java (81%)
 rename spring-framework/{ch07_spring-data-jpa/src/main/java/bnymellon => ch05_spring-hibernate/src/main/java/bny}/training/spring/framework/config/ColoredShapeConfig.java (82%)
 rename spring-framework/ch05_spring-hibernate/src/main/java/{bnymellon => bny}/training/spring/framework/config/HibernateSessionConfig.java (95%)
 rename spring-framework/ch05_spring-hibernate/src/main/java/{bnymellon => bny}/training/spring/framework/controller/ColoredShapeControllingBean.java (89%)
 rename spring-framework/{ch06_spring-jpa/src/main/java/bnymellon => ch05_spring-hibernate/src/main/java/bny}/training/spring/framework/dao/ColoredShapeDao.java (81%)
 rename spring-framework/ch05_spring-hibernate/src/main/java/{bnymellon => bny}/training/spring/framework/dao/ColoredShapeDaoImpl.java (90%)
 rename spring-framework/ch05_spring-hibernate/src/main/java/{bnymellon => bny}/training/spring/framework/model/ColoredShape.java (96%)
 rename spring-framework/ch05_spring-hibernate/src/main/java/{bnymellon => bny}/training/spring/framework/service/ColoredShapeService.java (81%)
 rename spring-framework/ch05_spring-hibernate/src/main/java/{bnymellon => bny}/training/spring/framework/service/ColoredShapeServiceImpl.java (84%)
 rename spring-framework/ch06_spring-jpa/src/main/java/{bnymellon => bny}/training/spring/framework/ColoredShapeApplication.java (81%)
 rename spring-framework/ch06_spring-jpa/src/main/java/{bnymellon => bny}/training/spring/framework/config/ColoredShapeConfig.java (82%)
 rename spring-framework/ch06_spring-jpa/src/main/java/{bnymellon => bny}/training/spring/framework/config/HibernateJPAConfig.java (96%)
 rename spring-framework/ch06_spring-jpa/src/main/java/{bnymellon => bny}/training/spring/framework/controller/ColoredShapeControllingBean.java (90%)
 rename spring-framework/{ch05_spring-hibernate/src/main/java/bnymellon => ch06_spring-jpa/src/main/java/bny}/training/spring/framework/dao/ColoredShapeDao.java (81%)
 rename spring-framework/ch06_spring-jpa/src/main/java/{bnymellon => bny}/training/spring/framework/dao/ColoredShapeDaoImpl.java (90%)
 rename spring-framework/ch06_spring-jpa/src/main/java/{bnymellon => bny}/training/spring/framework/model/ColoredShape.java (96%)
 rename spring-framework/ch06_spring-jpa/src/main/java/{bnymellon => bny}/training/spring/framework/service/ColoredShapeService.java (81%)
 rename spring-framework/ch06_spring-jpa/src/main/java/{bnymellon => bny}/training/spring/framework/service/ColoredShapeServiceImpl.java (84%)
 rename spring-framework/{ch05_spring-hibernate/src/main/java/bnymellon => ch07_spring-data-jpa/src/main/java/bny}/training/spring/framework/ColoredShapeApplication.java (81%)
 rename spring-framework/{ch05_spring-hibernate/src/main/java/bnymellon => ch07_spring-data-jpa/src/main/java/bny}/training/spring/framework/config/ColoredShapeConfig.java (82%)
 rename spring-framework/ch07_spring-data-jpa/src/main/java/{bnymellon => bny}/training/spring/framework/config/HibernateJPAConfig.java (95%)
 rename spring-framework/ch07_spring-data-jpa/src/main/java/{bnymellon => bny}/training/spring/framework/controller/ColoredShapeControllingBean.java (91%)
 rename spring-framework/ch07_spring-data-jpa/src/main/java/{bnymellon => bny}/training/spring/framework/dao/ColoredShapeDao.java (87%)
 rename spring-framework/ch07_spring-data-jpa/src/main/java/{bnymellon => bny}/training/spring/framework/model/ColoredShape.java (96%)
 rename spring-framework/ch07_spring-data-jpa/src/main/java/{bnymellon => bny}/training/spring/framework/service/ColoredShapeService.java (83%)
 rename spring-framework/ch07_spring-data-jpa/src/main/java/{bnymellon => bny}/training/spring/framework/service/ColoredShapeServiceImpl.java (87%)
 rename spring-framework/ch08_spring-rest/src/main/java/{bnymellon => bny}/training/spring/framework/ColoredShapeApplication.java (84%)
 rename spring-framework/ch08_spring-rest/src/main/java/{bnymellon => bny}/training/spring/framework/config/ColoredShapeConfig.java (87%)
 rename spring-framework/ch08_spring-rest/src/main/java/{bnymellon => bny}/training/spring/framework/config/HibernateJPAConfig.java (96%)
 rename spring-framework/ch08_spring-rest/src/main/java/{bnymellon => bny}/training/spring/framework/controller/ColoredShapeController.java (96%)
 rename spring-framework/ch08_spring-rest/src/main/java/{bnymellon => bny}/training/spring/framework/dao/ColoredShapeDao.java (90%)
 rename spring-framework/ch08_spring-rest/src/main/java/{bnymellon => bny}/training/spring/framework/model/ColoredShape.java (98%)
 rename spring-framework/ch08_spring-rest/src/main/java/{bnymellon => bny}/training/spring/framework/service/ColoredShapeService.java (88%)
 rename spring-framework/ch08_spring-rest/src/main/java/{bnymellon => bny}/training/spring/framework/service/ColoredShapeServiceImpl.java (91%)

diff --git a/CONTRIBUTING.MD b/CONTRIBUTING.MD
index adc0720..1add03a 100644
--- a/CONTRIBUTING.MD
+++ b/CONTRIBUTING.MD
@@ -1,4 +1,4 @@
-Thank you for visiting BNY Mellon's GitHub.
+Thank you for visiting BNY's GitHub.
 
 We currently do not accept external code contributions. 
 
@@ -6,4 +6,4 @@ We appreciate any potential issues or concerns reported by the community, and ma
 
 Thank you for your interest!
 
-BNY Mellon
+BNY
diff --git a/pom.xml b/pom.xml
index 7d6c493..e93139d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright 2021 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.training.spring.boot</groupId>
+    <groupId>bny.training.spring.boot</groupId>
     <artifactId>parent</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>
diff --git a/spring-boot-with-admin/admin/pom.xml b/spring-boot-with-admin/admin/pom.xml
index 7917f04..1b7ab41 100644
--- a/spring-boot-with-admin/admin/pom.xml
+++ b/spring-boot-with-admin/admin/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2022 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.training.spring.boot</groupId>
+    <groupId>bny.training.spring.boot</groupId>
     <artifactId>admin</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>
diff --git a/spring-boot-with-admin/admin/src/main/java/bnymellon/training/spring/boot/admin/SpringBootAdminApplication.java b/spring-boot-with-admin/admin/src/main/java/bny/training/spring/boot/admin/SpringBootAdminApplication.java
similarity index 91%
rename from spring-boot-with-admin/admin/src/main/java/bnymellon/training/spring/boot/admin/SpringBootAdminApplication.java
rename to spring-boot-with-admin/admin/src/main/java/bny/training/spring/boot/admin/SpringBootAdminApplication.java
index 48cf569..d459209 100644
--- a/spring-boot-with-admin/admin/src/main/java/bnymellon/training/spring/boot/admin/SpringBootAdminApplication.java
+++ b/spring-boot-with-admin/admin/src/main/java/bny/training/spring/boot/admin/SpringBootAdminApplication.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.admin;
+package bny.training.spring.boot.admin;
 
-import bnymellon.training.spring.boot.admin.config.SecurityConfiguration;
+import bny.training.spring.boot.admin.config.SecurityConfiguration;
 import de.codecentric.boot.admin.server.config.EnableAdminServer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
diff --git a/spring-boot-with-admin/admin/src/main/java/bnymellon/training/spring/boot/admin/config/SecurityConfiguration.java b/spring-boot-with-admin/admin/src/main/java/bny/training/spring/boot/admin/config/SecurityConfiguration.java
similarity index 98%
rename from spring-boot-with-admin/admin/src/main/java/bnymellon/training/spring/boot/admin/config/SecurityConfiguration.java
rename to spring-boot-with-admin/admin/src/main/java/bny/training/spring/boot/admin/config/SecurityConfiguration.java
index 27b0f30..b2bd79b 100644
--- a/spring-boot-with-admin/admin/src/main/java/bnymellon/training/spring/boot/admin/config/SecurityConfiguration.java
+++ b/spring-boot-with-admin/admin/src/main/java/bny/training/spring/boot/admin/config/SecurityConfiguration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.admin.config;
+package bny.training.spring.boot.admin.config;
 
 import de.codecentric.boot.admin.server.config.AdminServerProperties;
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
diff --git a/spring-boot-with-admin/admin/src/test/java/bnymellon/training/spring/boot/admin/SpringBootAdminApplicationTests.java b/spring-boot-with-admin/admin/src/test/java/bny/training/spring/boot/admin/SpringBootAdminApplicationTests.java
similarity index 89%
rename from spring-boot-with-admin/admin/src/test/java/bnymellon/training/spring/boot/admin/SpringBootAdminApplicationTests.java
rename to spring-boot-with-admin/admin/src/test/java/bny/training/spring/boot/admin/SpringBootAdminApplicationTests.java
index e4e2bc0..3231097 100644
--- a/spring-boot-with-admin/admin/src/test/java/bnymellon/training/spring/boot/admin/SpringBootAdminApplicationTests.java
+++ b/spring-boot-with-admin/admin/src/test/java/bny/training/spring/boot/admin/SpringBootAdminApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.admin;
+package bny.training.spring.boot.admin;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/spring-boot-with-admin/notification/pom.xml b/spring-boot-with-admin/notification/pom.xml
index 742aefe..c526180 100644
--- a/spring-boot-with-admin/notification/pom.xml
+++ b/spring-boot-with-admin/notification/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2022 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-	<groupId>bnymellon.training.spring.boot</groupId>
+	<groupId>bny.training.spring.boot</groupId>
 	<artifactId>notification</artifactId>
 	<version>1.0.0</version>
 	<packaging>jar</packaging>
diff --git a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/NotificationApplication.java b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/NotificationApplication.java
similarity index 82%
rename from spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/NotificationApplication.java
rename to spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/NotificationApplication.java
index a1564bc..65edfec 100644
--- a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/NotificationApplication.java
+++ b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/NotificationApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification;
+package bny.training.spring.boot.notification;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication(scanBasePackages = "bnymellon.training.spring.boot")
+@SpringBootApplication(scanBasePackages = "bny.training.spring.boot")
 public class NotificationApplication {
 
     public static void main(String[] args) {
diff --git a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/controller/NotificationAPIContract.java b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/controller/NotificationAPIContract.java
similarity index 90%
rename from spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/controller/NotificationAPIContract.java
rename to spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/controller/NotificationAPIContract.java
index d49c360..6540008 100644
--- a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/controller/NotificationAPIContract.java
+++ b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/controller/NotificationAPIContract.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.controller;
+package bny.training.spring.boot.notification.controller;
 
-import bnymellon.training.spring.boot.notification.model.Todo;
+import bny.training.spring.boot.notification.model.Todo;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/controller/NotificationAPIContractImpl.java b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/controller/NotificationAPIContractImpl.java
similarity index 87%
rename from spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/controller/NotificationAPIContractImpl.java
rename to spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/controller/NotificationAPIContractImpl.java
index ed3b376..b15853a 100644
--- a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/controller/NotificationAPIContractImpl.java
+++ b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/controller/NotificationAPIContractImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.controller;
+package bny.training.spring.boot.notification.controller;
 
-import bnymellon.training.spring.boot.notification.model.Todo;
-import bnymellon.training.spring.boot.notification.service.NotificationService;
+import bny.training.spring.boot.notification.model.Todo;
+import bny.training.spring.boot.notification.service.NotificationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/model/Todo.java b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/model/Todo.java
similarity index 97%
rename from spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/model/Todo.java
rename to spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/model/Todo.java
index cc2cd77..1011f11 100644
--- a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/model/Todo.java
+++ b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/model/Todo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.model;
+package bny.training.spring.boot.notification.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/model/response/Metadata.java b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/model/response/Metadata.java
similarity index 98%
rename from spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/model/response/Metadata.java
rename to spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/model/response/Metadata.java
index d05a69f..bd4ce40 100644
--- a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/model/response/Metadata.java
+++ b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/model/response/Metadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.model.response;
+package bny.training.spring.boot.notification.model.response;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/model/response/Status.java b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/model/response/Status.java
similarity index 96%
rename from spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/model/response/Status.java
rename to spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/model/response/Status.java
index 9733aee..16d7cf8 100644
--- a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/model/response/Status.java
+++ b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/model/response/Status.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.model.response;
+package bny.training.spring.boot.notification.model.response;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/model/response/TodoCollectionResponse.java b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/model/response/TodoCollectionResponse.java
similarity index 93%
rename from spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/model/response/TodoCollectionResponse.java
rename to spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/model/response/TodoCollectionResponse.java
index d5bb8fd..a5adbc7 100644
--- a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/model/response/TodoCollectionResponse.java
+++ b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/model/response/TodoCollectionResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.model.response;
+package bny.training.spring.boot.notification.model.response;
 
-import bnymellon.training.spring.boot.notification.model.Todo;
+import bny.training.spring.boot.notification.model.Todo;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
diff --git a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/model/response/TodoResponse.java b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/model/response/TodoResponse.java
similarity index 83%
rename from spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/model/response/TodoResponse.java
rename to spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/model/response/TodoResponse.java
index 659f95a..e7276be 100644
--- a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/model/response/TodoResponse.java
+++ b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/model/response/TodoResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.model.response;
+package bny.training.spring.boot.notification.model.response;
 
 public interface TodoResponse {
 }
diff --git a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/service/NotificationService.java b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/service/NotificationService.java
similarity index 83%
rename from spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/service/NotificationService.java
rename to spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/service/NotificationService.java
index 94aa48d..4ea761a 100644
--- a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/service/NotificationService.java
+++ b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/service/NotificationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.service;
+package bny.training.spring.boot.notification.service;
 
-import bnymellon.training.spring.boot.notification.model.Todo;
+import bny.training.spring.boot.notification.model.Todo;
 import reactor.core.publisher.Flux;
 
 import java.util.List;
diff --git a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/service/NotificationServiceImpl.java b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/service/NotificationServiceImpl.java
similarity index 94%
rename from spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/service/NotificationServiceImpl.java
rename to spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/service/NotificationServiceImpl.java
index cb013ad..bd88180 100644
--- a/spring-boot-with-admin/notification/src/main/java/bnymellon/training/spring/boot/notification/service/NotificationServiceImpl.java
+++ b/spring-boot-with-admin/notification/src/main/java/bny/training/spring/boot/notification/service/NotificationServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.service;
+package bny.training.spring.boot.notification.service;
 
-import bnymellon.training.spring.boot.notification.model.Todo;
-import bnymellon.training.spring.boot.notification.model.response.TodoCollectionResponse;
+import bny.training.spring.boot.notification.model.response.TodoCollectionResponse;
+import bny.training.spring.boot.notification.model.Todo;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.WebClient;
diff --git a/spring-boot-with-admin/notification/src/test/java/bnymellon/training/spring/boot/notification/controller/NotificationAPIContractTest.java b/spring-boot-with-admin/notification/src/test/java/bny/training/spring/boot/notification/controller/NotificationAPIContractTest.java
similarity index 94%
rename from spring-boot-with-admin/notification/src/test/java/bnymellon/training/spring/boot/notification/controller/NotificationAPIContractTest.java
rename to spring-boot-with-admin/notification/src/test/java/bny/training/spring/boot/notification/controller/NotificationAPIContractTest.java
index 42c8166..8a3db72 100644
--- a/spring-boot-with-admin/notification/src/test/java/bnymellon/training/spring/boot/notification/controller/NotificationAPIContractTest.java
+++ b/spring-boot-with-admin/notification/src/test/java/bny/training/spring/boot/notification/controller/NotificationAPIContractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.controller;
+package bny.training.spring.boot.notification.controller;
 
-import bnymellon.training.spring.boot.notification.model.Todo;
-import bnymellon.training.spring.boot.notification.service.NotificationService;
+import bny.training.spring.boot.notification.model.Todo;
+import bny.training.spring.boot.notification.service.NotificationService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/spring-boot-with-admin/notification/src/test/java/bnymellon/training/spring/boot/notification/service/NotificationServiceTest.java b/spring-boot-with-admin/notification/src/test/java/bny/training/spring/boot/notification/service/NotificationServiceTest.java
similarity index 94%
rename from spring-boot-with-admin/notification/src/test/java/bnymellon/training/spring/boot/notification/service/NotificationServiceTest.java
rename to spring-boot-with-admin/notification/src/test/java/bny/training/spring/boot/notification/service/NotificationServiceTest.java
index 1df5ba2..986bdc2 100644
--- a/spring-boot-with-admin/notification/src/test/java/bnymellon/training/spring/boot/notification/service/NotificationServiceTest.java
+++ b/spring-boot-with-admin/notification/src/test/java/bny/training/spring/boot/notification/service/NotificationServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.notification.service;
+package bny.training.spring.boot.notification.service;
 
-import bnymellon.training.spring.boot.notification.model.Todo;
-import bnymellon.training.spring.boot.notification.model.response.TodoCollectionResponse;
+import bny.training.spring.boot.notification.model.response.TodoCollectionResponse;
+import bny.training.spring.boot.notification.model.Todo;
 import org.apache.http.client.ResponseHandler;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -27,7 +27,6 @@
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.web.reactive.function.client.ClientResponse;
 import org.springframework.web.reactive.function.client.WebClient;
 import org.springframework.web.server.ResponseStatusException;
 import reactor.core.publisher.Flux;
@@ -36,7 +35,6 @@
 
 import java.time.Duration;
 import java.util.List;
-import java.util.function.Function;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
diff --git a/spring-boot-with-admin/pom.xml b/spring-boot-with-admin/pom.xml
index a73059a..ed9b145 100644
--- a/spring-boot-with-admin/pom.xml
+++ b/spring-boot-with-admin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  ~ Copyright 2021 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.training.spring.boot</groupId>
+    <groupId>bny.training.spring.boot</groupId>
     <artifactId>spring-boot-with-admin</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>
diff --git a/spring-boot-with-admin/registry/pom.xml b/spring-boot-with-admin/registry/pom.xml
index be56d5e..ea63b86 100644
--- a/spring-boot-with-admin/registry/pom.xml
+++ b/spring-boot-with-admin/registry/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2022 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-	<groupId>bnymellon.training.spring.boot</groupId>
+	<groupId>bny.training.spring.boot</groupId>
 	<artifactId>registry</artifactId>
 	<version>1.0.0</version>
 	<packaging>jar</packaging>
diff --git a/spring-boot-with-admin/registry/src/main/java/bnymellon/training/spring/boot/registry/RegistryApplication.java b/spring-boot-with-admin/registry/src/main/java/bny/training/spring/boot/registry/RegistryApplication.java
similarity index 90%
rename from spring-boot-with-admin/registry/src/main/java/bnymellon/training/spring/boot/registry/RegistryApplication.java
rename to spring-boot-with-admin/registry/src/main/java/bny/training/spring/boot/registry/RegistryApplication.java
index 9968d1d..ff5fe54 100644
--- a/spring-boot-with-admin/registry/src/main/java/bnymellon/training/spring/boot/registry/RegistryApplication.java
+++ b/spring-boot-with-admin/registry/src/main/java/bny/training/spring/boot/registry/RegistryApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.registry;
+package bny.training.spring.boot.registry;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-boot-with-admin/registry/src/test/java/bnymellon/training/spring/boot/registry/RegistryApplicationTests.java b/spring-boot-with-admin/registry/src/test/java/bny/training/spring/boot/registry/RegistryApplicationTests.java
similarity index 88%
rename from spring-boot-with-admin/registry/src/test/java/bnymellon/training/spring/boot/registry/RegistryApplicationTests.java
rename to spring-boot-with-admin/registry/src/test/java/bny/training/spring/boot/registry/RegistryApplicationTests.java
index 2adb0b1..e57f62f 100644
--- a/spring-boot-with-admin/registry/src/test/java/bnymellon/training/spring/boot/registry/RegistryApplicationTests.java
+++ b/spring-boot-with-admin/registry/src/test/java/bny/training/spring/boot/registry/RegistryApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.registry;
+package bny.training.spring.boot.registry;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/spring-boot/assets/docs/01_HowToCreateANewSpringBootProject.adoc b/spring-boot/assets/docs/01_HowToCreateANewSpringBootProject.adoc
index dc62022..2ad73b8 100644
--- a/spring-boot/assets/docs/01_HowToCreateANewSpringBootProject.adoc
+++ b/spring-boot/assets/docs/01_HowToCreateANewSpringBootProject.adoc
@@ -34,7 +34,7 @@ The common methods of setting up Spring boot are:
 Defaults are acceptable: Generate a Maven Project with Java 11 and Spring Boot 2.4.x
 
 . Provide a group id and artifact id: +
-*Group*: `bnymellon.training.spring.boot` +
+*Group*: `bny.training.spring.boot` +
 *Artifact*: `lab` +
 
 . Switch to using the full version of the wizard.
@@ -54,7 +54,7 @@ Defaults are acceptable (choose a Java 11 SDK). +
 → Next
 
 . Provide a group id and artifact id: +
-*Group*: `bnymellon.training.spring.boot` +
+*Group*: `bny.training.spring.boot` +
 *Artifact*: `lab` +
 → Next
 
@@ -73,9 +73,9 @@ Defaults are acceptable (choose a Java 11 SDK).
 
 . Update the fields : +
 *Name*: `lab` +
-*Group*: `bnymellon.training.spring.boot` +
+*Group*: `bny.training.spring.boot` +
 *Artifact*: `lab` +
-*Package*: `bnymellon.training.spring.boot.lab`
+*Package*: `bny.training.spring.boot.lab`
 
 . Accept / modify default location and project information. +
 → Next
diff --git a/spring-boot/assets/docs/04_ModelLayer.adoc b/spring-boot/assets/docs/04_ModelLayer.adoc
index 366dd9f..2178159 100644
--- a/spring-boot/assets/docs/04_ModelLayer.adoc
+++ b/spring-boot/assets/docs/04_ModelLayer.adoc
@@ -21,7 +21,7 @@ Building the model and its unit tests
 
 == The Model Layer
 The model consists of only one entity that is managed by the service. +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/model/Todo.java[Todo.java] +
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/model/Todo.java[Todo.java] +
 
 . Mark the object as an JPA entity +
 .. Look for the `@Entity` above the class declaration.
@@ -48,7 +48,7 @@ attributes in documentation and for formatting the field ordering in a JSON outp
 
 == The Model unit test
 The model is simply a few attributes, the test focuses on the equals, hashCode and the toString. +
-⇒ link:../../todo/src/test/java/bnymellon/training/spring/boot/todo/model/TodoTest.java[TodoTest.java]
+⇒ link:../../todo/src/test/java/bny/training/spring/boot/todo/model/TodoTest.java[TodoTest.java]
 
 . There are four `Todo` instances in the test.
 . Two instances: `todo1` and `todo2` have the same content while two other instances `emptyTodo1`
diff --git a/spring-boot/assets/docs/05_DAOLayer.adoc b/spring-boot/assets/docs/05_DAOLayer.adoc
index 2d00125..67f1582 100644
--- a/spring-boot/assets/docs/05_DAOLayer.adoc
+++ b/spring-boot/assets/docs/05_DAOLayer.adoc
@@ -21,7 +21,7 @@ Building the *data access layer* (DAO) and its unit tests
 
 == The Repository DAO Layer
 Spring Data JPA takes care of most of the data access layer. +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/dao/TodoRepository.java[TodoRepository.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/dao/TodoRepository.java[TodoRepository.java]
 
 . Most CRUD operations are supplied by the parent interface `JpaRepository` from Spring
 (`org.springframework.data.jpa.repository` package) +
@@ -50,7 +50,7 @@ NOTE: The named query uses Java class and field names, rather than database tabl
 .. Look for `dbunit` is a dependency in the `pom.xml`.
 
 . Spring Boot test-related annotations +
-⇒ link:../../todo/src/test/java/bnymellon/training/spring/boot/todo/dao/TodoRepositoryTest.java[TodoRepositoryTest.java] +
+⇒ link:../../todo/src/test/java/bny/training/spring/boot/todo/dao/TodoRepositoryTest.java[TodoRepositoryTest.java] +
 .. The JUnit 5 `@ExtendWith` annotation is set to include the `SpringExtension` thus registering that
 this unit test is has a Spring context. +
 .. The DAO is tested with `@SpringBootTest`. This is a special annotation with Spring Boot that
diff --git a/spring-boot/assets/docs/06_Exceptions.adoc b/spring-boot/assets/docs/06_Exceptions.adoc
index f565f3c..8a7557d 100644
--- a/spring-boot/assets/docs/06_Exceptions.adoc
+++ b/spring-boot/assets/docs/06_Exceptions.adoc
@@ -26,16 +26,16 @@ invalid length of assignee parameter, and a todo not found use case, common in `
 and ``DELETE``s.
 
 . Invalid ID +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/model/exception/InvalidIdException.java[InvalidIdException.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/model/exception/InvalidIdException.java[InvalidIdException.java]
 
 . Invalid Assignee +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/model/exception/InvalidAssigneeException.java[InvalidAssigneeException.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/model/exception/InvalidAssigneeException.java[InvalidAssigneeException.java]
 
 . Todo Not Found +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/model/exception/TodoNotFoundException.java[TodoNotFoundException.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/model/exception/TodoNotFoundException.java[TodoNotFoundException.java]
 
 . Constants +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/TodoConstants.java[TodoConstants.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/TodoConstants.java[TodoConstants.java]
 
 '''
 
diff --git a/spring-boot/assets/docs/07_ServiceLayer.adoc b/spring-boot/assets/docs/07_ServiceLayer.adoc
index 8302d12..825c41c 100644
--- a/spring-boot/assets/docs/07_ServiceLayer.adoc
+++ b/spring-boot/assets/docs/07_ServiceLayer.adoc
@@ -33,11 +33,11 @@ The service layer:
 We use an interface-implementation model here, so we have more flexibility in autowiring and testing.
 
 . Service Interface +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/service/TodoService.java[TodoService.java] +
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/service/TodoService.java[TodoService.java] +
 .. This interface defines all the service methods that are publicly available.
 
 . Service Implementation +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/service/TodoServiceImpl.java[TodoServiceImpl.java] +
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/service/TodoServiceImpl.java[TodoServiceImpl.java] +
 .. The Service implementation implements all the methods listed in the Service interface.
 .. The `constructor` autowires a `TodoRepository` interface which is made available via a Spring
 context.
@@ -51,7 +51,7 @@ throw necessary custom exceptions (in this example, extending the RuntimeExcepti
 The service is tested with `@SpringBootTest`.
 
 . Test extending the abstract test setup +
-⇒ link:../../todo/src/test/java/bnymellon/training/spring/boot/todo/service/TodoServiceTest.java[TodoServiceTest.java]
+⇒ link:../../todo/src/test/java/bny/training/spring/boot/todo/service/TodoServiceTest.java[TodoServiceTest.java]
 .. The `setUp()` method runs *_before each test method_* and adds a Mock implementation of the
 repository.
 .. A Mock object wraps around the actual one, and replaces certain method calls with other
diff --git a/spring-boot/assets/docs/08_ControllerLayer.adoc b/spring-boot/assets/docs/08_ControllerLayer.adoc
index 5a2963c..ccca50d 100644
--- a/spring-boot/assets/docs/08_ControllerLayer.adoc
+++ b/spring-boot/assets/docs/08_ControllerLayer.adoc
@@ -28,26 +28,26 @@ The response package has several java classes that make up various data and erro
 responses.
 
 . A Status object to provide status information (request success, code and a description) +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/Status.java[Status.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/model/response/Status.java[Status.java]
 
 . A Metadata object to provide request and response metadata +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/Metadata.java[Metadata.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/model/response/Metadata.java[Metadata.java]
 
 . An Issue object to include exception details issue code and description +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/Issue.java[Issue.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/model/response/Issue.java[Issue.java]
 
 . A TodoResponse interface is a marker interface for several other responses +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoResponse.java[TodoResponse.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoResponse.java[TodoResponse.java]
 .. A *marker* (or *tagging*) interface is one that has no actual methods. The sole pupose is to act as a hierarchical ancestor for a class that implements such an interface.
 
 . A TodoSuccessResponse object that includes a metadata and a single todo object +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoSuccessResponse.java[TodoSuccessResponse.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoSuccessResponse.java[TodoSuccessResponse.java]
 
 . A TodoErrorResponse object that includes a metadata and a list of issues associated +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoErrorResponse.java[TodoErrorResponse.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoErrorResponse.java[TodoErrorResponse.java]
 
 . A TodoCollectionResponse object that includes a metadata and a list of todo objects +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoCollectionResponse.java[TodoCollectionResponse.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoCollectionResponse.java[TodoCollectionResponse.java]
 
 '''
 
@@ -56,22 +56,22 @@ As with the model, the responses have a few attributes, the tests focus on the `
 and the `toString` methods.
 
 . StatusTest +
-⇒ link:../../todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/StatusTest.java[StatusTest.java]
+⇒ link:../../todo/src/test/java/bny/training/spring/boot/todo/model/response/StatusTest.java[StatusTest.java]
 
 . MetadataTest +
-⇒ link:../../todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/MetadataTest.java[MetadataTest.java]
+⇒ link:../../todo/src/test/java/bny/training/spring/boot/todo/model/response/MetadataTest.java[MetadataTest.java]
 
 . IssueTest  +
-⇒ link:../../todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/IssueTest.java[IssueTest.java]
+⇒ link:../../todo/src/test/java/bny/training/spring/boot/todo/model/response/IssueTest.java[IssueTest.java]
 
 . TodoSuccessResponseTest +
-⇒ link:../../todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/TodoSuccessResponseTest.java[TodoSuccessResponseTest.java]
+⇒ link:../../todo/src/test/java/bny/training/spring/boot/todo/model/response/TodoSuccessResponseTest.java[TodoSuccessResponseTest.java]
 
 . TodoErrorResponseTest  +
-⇒ link:../../todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/TodoErrorResponseTest.java[TodoErrorResponseTest.java]
+⇒ link:../../todo/src/test/java/bny/training/spring/boot/todo/model/response/TodoErrorResponseTest.java[TodoErrorResponseTest.java]
 
 . TodoCollectionResponseTest +
-⇒ link:../../todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/TodoCollectionResponseTest.java[TodoCollectionResponseTest.java]
+⇒ link:../../todo/src/test/java/bny/training/spring/boot/todo/model/response/TodoCollectionResponseTest.java[TodoCollectionResponseTest.java]
 
 '''
 
@@ -86,12 +86,12 @@ The controller package has an interface and an implementation. The interface is
 detail in a subsequent chapter.
 
 . Controller Interface +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContract.java[TodoAPIContract.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/controller/TodoAPIContract.java[TodoAPIContract.java]
 .. There are a lot of annotations on each interface method, but in essence, there are six declared
 methods, all of which, return a `ResponseEntity<TodoResponse>`.
 
 . ControllerImplementation +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContractImpl.java[TodoAPIContractImpl.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/controller/TodoAPIContractImpl.java[TodoAPIContractImpl.java]
 .. The controller implementation is marked with a `@RestController` stereotype.
 .. The class has a `@RequestMapping` annotation which provides a context path for the web URLs.
 .. The `constructor` autowires a `TodoService` interface which is made available via a Spring
@@ -108,7 +108,7 @@ NOTE: Ignore the annotations surrounding the methods, these will be discussed la
 The controller is tested with @SpringBootTest.
 
 . Test extending the abstract test setup +
-⇒ link:../../todo/src/test/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContractTest.java[TodoAPIContractTest.java]
+⇒ link:../../todo/src/test/java/bny/training/spring/boot/todo/controller/TodoAPIContractTest.java[TodoAPIContractTest.java]
 .. This test extends from the *abstract* test class which adds a *mock* implementation of the
 `TodoService` with a `@MockBean` annotation.
 .. The `@MockBean` is a mockito utility present in the `spring-boot-test.jar` that injects a bean
@@ -117,7 +117,7 @@ into the Spring context after adding some mock responses.
 testing all operations, so no JSON is sent with the request and no JSON is expected as a response.
 
 . Abstract mock setup +
-⇒ link:../../todo/src/test/java/bnymellon/training/spring/boot/todo/AbstractTodoMockSetupTest.java[AbstractTodoMockSetupTest.java]
+⇒ link:../../todo/src/test/java/bny/training/spring/boot/todo/AbstractTodoMockSetupTest.java[AbstractTodoMockSetupTest.java]
 .. Abstract mock class (re-used in other tests)
 
 '''
diff --git a/spring-boot/assets/docs/09_ProfilesConfiguration.adoc b/spring-boot/assets/docs/09_ProfilesConfiguration.adoc
index 2fa58d3..2ac2e6a 100644
--- a/spring-boot/assets/docs/09_ProfilesConfiguration.adoc
+++ b/spring-boot/assets/docs/09_ProfilesConfiguration.adoc
@@ -64,7 +64,7 @@ sections.
 .. A value for `todo.descriptiveText` is set when the *production* profile is activated.
 
 . Loading the custom configurations into the context +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/config/ProfileConfigurationProperties.java[ProfileConfigurationProperties.java] +
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/config/ProfileConfigurationProperties.java[ProfileConfigurationProperties.java] +
 .. The `@ConfigurationProperties` sets the prefix for the properties handled by this class.
 .. The `title` and `descriptiveText` are loaded into the instance, which is also injected into
 the context, thanks to the `@Component` annotation.
@@ -87,12 +87,12 @@ While the actual Swagger documentation context is not yet covered, as a preview,
 usage of profiles in the Swagger configuration.
 
 . Default Swagger configuration +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/config/TodoDefaultServiceSwaggerConfig.java[TodoDefaultServiceSwaggerConfig.java] +
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/config/TodoDefaultServiceSwaggerConfig.java[TodoDefaultServiceSwaggerConfig.java] +
 .. This configuration is loaded when no profile is specifically made active.
 .. The `@Profile` annotation at the class specifies that this is activated for the *default* profile.
 
 . Development Swagger configuration +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/config/TodoDevelopmentServiceSwaggerConfig.java[TodoDevelopmentServiceSwaggerConfig.java] +
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/config/TodoDevelopmentServiceSwaggerConfig.java[TodoDevelopmentServiceSwaggerConfig.java] +
 .. This configuration is loaded when the *development* profile is made active (and the *default*
 profile is inactive).
 .. The `@Profile` annotation at the class specifies that this is activated for the *development*
@@ -100,7 +100,7 @@ profile and not when the *default* active.
 .. This configuration uses the `@Autowired` `ProfileConfigurationProperties` instance.
 
 . Production Swagger configuration +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/config/TodoProductionServiceSwaggerConfig.java[TodoProductionServiceSwaggerConfig.java] +
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/config/TodoProductionServiceSwaggerConfig.java[TodoProductionServiceSwaggerConfig.java] +
 .. This configuration is loaded when the *production* profile is made active (and the *default*
 profile is inactive).
 .. The `@Profile` annotation at the class specifies that this is activated for the *production*
diff --git a/spring-boot/assets/docs/10_Documentation.adoc b/spring-boot/assets/docs/10_Documentation.adoc
index c643c26..7103ac9 100644
--- a/spring-boot/assets/docs/10_Documentation.adoc
+++ b/spring-boot/assets/docs/10_Documentation.adoc
@@ -27,10 +27,10 @@ contract for the API to the consumers of the service.
 The ideal location for the documentation thus is the interface.
 
 Interface +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContract.java[TodoAPIContract.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/controller/TodoAPIContract.java[TodoAPIContract.java]
 
 Model +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/model/Todo.java[Todo.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/model/Todo.java[Todo.java]
 
 Below is a list of annotations used to document the API.
 
@@ -55,13 +55,13 @@ meaningful document. This is done via a @Configuration class that Spring Boot lo
 As covered in the previous chapter, Swagger configurations rely on Profiles.
 
 . Default Swagger Configuration
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/config/TodoDefaultServiceSwaggerConfig.java[TodoDefaultServiceSwaggerConfig.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/config/TodoDefaultServiceSwaggerConfig.java[TodoDefaultServiceSwaggerConfig.java]
 
 . Development Swagger Configuration
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/config/TodoDevelopmentServiceSwaggerConfig.java[TodoDevelopmentServiceSwaggerConfig.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/config/TodoDevelopmentServiceSwaggerConfig.java[TodoDevelopmentServiceSwaggerConfig.java]
 
 . Production Swagger Configuration
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/config/TodoProductionServiceSwaggerConfig.java[TodoProductionServiceSwaggerConfig.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/config/TodoProductionServiceSwaggerConfig.java[TodoProductionServiceSwaggerConfig.java]
 
 `@EnableSwagger2`:: Indicates that Swagger support should be enabled. Only functional if included
 in a class also marked as a @Configuration.
@@ -97,7 +97,7 @@ invoking consumer of the service gets a detailed information. The HTTP error cod
 important means to automate processing of responses for the service consumer.
 
 . The Contract implementation +
-⇒ link:../../todo/src/main/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContractImpl.java[TodoAPIContractImpl.java]
+⇒ link:../../todo/src/main/java/bny/training/spring/boot/todo/controller/TodoAPIContractImpl.java[TodoAPIContractImpl.java]
 .. `TodoNotFoundException` - (404) Handling
 .. `InvalidIdException` - (412) Handling
 .. `InvalidAssigneeException` - (412) Handling
diff --git a/spring-boot/assets/docs/11_APITests.adoc b/spring-boot/assets/docs/11_APITests.adoc
index 5c57971..b838d01 100644
--- a/spring-boot/assets/docs/11_APITests.adoc
+++ b/spring-boot/assets/docs/11_APITests.adoc
@@ -27,7 +27,7 @@ Spring's `MockMvc` as a framework of choice for testing the RESTful layer.
 MockMvc works by launching the application in a simulated server.
 
 . Spring Boot Web Application Test +
-⇒ link:../../todo/src/test/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContractRestTest.java[TodoAPIContractRestTest.java]
+⇒ link:../../todo/src/test/java/bny/training/spring/boot/todo/controller/TodoAPIContractRestTest.java[TodoAPIContractRestTest.java]
 .. The test is still launched by extending JUnit using an `@ExtendWith` annotation and supplying a
 `SpringExtension.class`.
 .. The second class annotation declares that this test is a `@WebMvcTest`. Using this annotation
diff --git a/spring-boot/todo/pom.xml b/spring-boot/todo/pom.xml
index 51039ec..3ce9858 100644
--- a/spring-boot/todo/pom.xml
+++ b/spring-boot/todo/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2021 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>bnymellon.training.spring.boot</groupId>
+    <groupId>bny.training.spring.boot</groupId>
     <artifactId>todo</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/TodoApplication.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/TodoApplication.java
similarity index 83%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/TodoApplication.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/TodoApplication.java
index 4fb08d8..df641ce 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/TodoApplication.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/TodoApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo;
+package bny.training.spring.boot.todo;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication(scanBasePackages = "bnymellon.training.spring.boot")
+@SpringBootApplication(scanBasePackages = "bny.training.spring.boot")
 public class TodoApplication {
 
     public static void main(String[] args) {
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/TodoConstants.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/TodoConstants.java
similarity index 91%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/TodoConstants.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/TodoConstants.java
index 5b6f2c6..a97caad 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/TodoConstants.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/TodoConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo;
+package bny.training.spring.boot.todo;
 
 public final class TodoConstants {
     //Exception messages
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/config/ProfileConfigurationProperties.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/config/ProfileConfigurationProperties.java
similarity index 92%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/config/ProfileConfigurationProperties.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/config/ProfileConfigurationProperties.java
index 9b135d0..d42dd7a 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/config/ProfileConfigurationProperties.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/config/ProfileConfigurationProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.config;
+package bny.training.spring.boot.todo.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/config/TodoDefaultServiceSwaggerConfig.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/config/TodoDefaultServiceSwaggerConfig.java
similarity index 86%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/config/TodoDefaultServiceSwaggerConfig.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/config/TodoDefaultServiceSwaggerConfig.java
index ad122c7..ef6ae88 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/config/TodoDefaultServiceSwaggerConfig.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/config/TodoDefaultServiceSwaggerConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.config;
+package bny.training.spring.boot.todo.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -43,7 +43,7 @@ public Docket api() {
         return new Docket(DocumentationType.SWAGGER_2)
                 .groupName("todo")
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("bnymellon.training.spring.boot.todo"))
+                .apis(RequestHandlerSelectors.basePackage("bny.training.spring.boot.todo"))
                 .paths(PathSelectors.any())
                 .build()
                 .apiInfo(apiInfo())
@@ -55,9 +55,9 @@ private ApiInfo apiInfo() {
                 .title(profileConfigurationProperties.getTitle())
                 .description("A " + profileConfigurationProperties.getDescriptiveText() +
                         " profile demo application showing how to setup a Spring Boot application")
-                .termsOfServiceUrl("https://www.bnymellon.com/us/en/terms-of-use.jsp")
+                .termsOfServiceUrl("https://www.bny.com/us/en/terms-of-use.jsp")
                 .license("BNY License")
-                .licenseUrl("https://www.bnymellon.com/us/en/terms-of-use.jsp")
+                .licenseUrl("https://www.bny.com/us/en/terms-of-use.jsp")
                 .version("1.0")
                 .build();
     }
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/config/TodoDevelopmentServiceSwaggerConfig.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/config/TodoDevelopmentServiceSwaggerConfig.java
similarity index 86%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/config/TodoDevelopmentServiceSwaggerConfig.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/config/TodoDevelopmentServiceSwaggerConfig.java
index 03d7c47..c08ab1c 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/config/TodoDevelopmentServiceSwaggerConfig.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/config/TodoDevelopmentServiceSwaggerConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.config;
+package bny.training.spring.boot.todo.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -43,7 +43,7 @@ public Docket api() {
         return new Docket(DocumentationType.SWAGGER_2)
                 .groupName("todo")
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("bnymellon.training.spring.boot.todo"))
+                .apis(RequestHandlerSelectors.basePackage("bny.training.spring.boot.todo"))
                 .paths(PathSelectors.any())
                 .build()
                 .apiInfo(apiInfo())
@@ -55,9 +55,9 @@ private ApiInfo apiInfo() {
                 .title(profileConfigurationProperties.getTitle())
                 .description("A " + profileConfigurationProperties.getDescriptiveText() +
                         " profile demo application showing how to setup a Spring Boot application")
-                .termsOfServiceUrl("https://www.bnymellon.com/us/en/terms-of-use.jsp")
+                .termsOfServiceUrl("https://www.bny.com/us/en/terms-of-use.jsp")
                 .license("BNY License")
-                .licenseUrl("https://www.bnymellon.com/us/en/terms-of-use.jsp")
+                .licenseUrl("https://www.bny.com/us/en/terms-of-use.jsp")
                 .version("1.0")
                 .build();
     }
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/config/TodoProductionServiceSwaggerConfig.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/config/TodoProductionServiceSwaggerConfig.java
similarity index 86%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/config/TodoProductionServiceSwaggerConfig.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/config/TodoProductionServiceSwaggerConfig.java
index 943cf8d..c25b8b5 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/config/TodoProductionServiceSwaggerConfig.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/config/TodoProductionServiceSwaggerConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.config;
+package bny.training.spring.boot.todo.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -43,7 +43,7 @@ public Docket api() {
         return new Docket(DocumentationType.SWAGGER_2)
                 .groupName("todo")
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("bnymellon.training.spring.boot.todo"))
+                .apis(RequestHandlerSelectors.basePackage("bny.training.spring.boot.todo"))
                 .paths(PathSelectors.any())
                 .build()
                 .apiInfo(apiInfo())
@@ -55,9 +55,9 @@ private ApiInfo apiInfo() {
                 .title(profileConfigurationProperties.getTitle())
                 .description("A " + profileConfigurationProperties.getDescriptiveText() +
                         " profile demo application showing how to setup a Spring Boot application")
-                .termsOfServiceUrl("https://www.bnymellon.com/us/en/terms-of-use.jsp")
+                .termsOfServiceUrl("https://www.bny.com/us/en/terms-of-use.jsp")
                 .license("BNY License")
-                .licenseUrl("https://www.bnymellon.com/us/en/terms-of-use.jsp")
+                .licenseUrl("https://www.bny.com/us/en/terms-of-use.jsp")
                 .version("1.0")
                 .build();
     }
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContract.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/controller/TodoAPIContract.java
similarity index 95%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContract.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/controller/TodoAPIContract.java
index 7bc78f9..2c6532c 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContract.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/controller/TodoAPIContract.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.controller;
+package bny.training.spring.boot.todo.controller;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
-import bnymellon.training.spring.boot.todo.model.response.TodoResponse;
-import bnymellon.training.spring.boot.todo.model.response.TodoSuccessResponse;
+import bny.training.spring.boot.todo.model.Todo;
+import bny.training.spring.boot.todo.model.response.TodoCollectionResponse;
+import bny.training.spring.boot.todo.model.response.TodoErrorResponse;
+import bny.training.spring.boot.todo.model.response.TodoResponse;
+import bny.training.spring.boot.todo.model.response.TodoSuccessResponse;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -37,10 +40,6 @@
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 
-import bnymellon.training.spring.boot.todo.model.Todo;
-import bnymellon.training.spring.boot.todo.model.response.TodoCollectionResponse;
-import bnymellon.training.spring.boot.todo.model.response.TodoErrorResponse;
-
 import static org.springframework.http.MediaType.ALL_VALUE;
 import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
@@ -73,7 +72,7 @@ public interface TodoAPIContract {
     ResponseEntity<TodoResponse> addTodo(
             @ApiParam(required = true, value = "A todo record to add")
             @Valid @RequestBody
-                    Todo todo,
+            Todo todo,
             HttpServletRequest request);
 
     //--------------------------------------------------------------------------------------------
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContractImpl.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/controller/TodoAPIContractImpl.java
similarity index 91%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContractImpl.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/controller/TodoAPIContractImpl.java
index 824f302..6df4481 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContractImpl.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/controller/TodoAPIContractImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,20 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.controller;
+package bny.training.spring.boot.todo.controller;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
-import bnymellon.training.spring.boot.todo.model.exception.InvalidAssigneeException;
-import bnymellon.training.spring.boot.todo.model.response.Issue;
-import bnymellon.training.spring.boot.todo.model.response.TodoErrorResponse;
-import bnymellon.training.spring.boot.todo.model.response.TodoResponse;
-import bnymellon.training.spring.boot.todo.model.response.TodoSuccessResponse;
+import bny.training.spring.boot.todo.model.Todo;
+import bny.training.spring.boot.todo.model.exception.InvalidAssigneeException;
+import bny.training.spring.boot.todo.model.exception.InvalidIdException;
+import bny.training.spring.boot.todo.model.exception.TodoNotFoundException;
+import bny.training.spring.boot.todo.service.TodoService;
+import bny.training.spring.boot.todo.model.response.Issue;
+import bny.training.spring.boot.todo.model.response.TodoErrorResponse;
+import bny.training.spring.boot.todo.model.response.TodoResponse;
+import bny.training.spring.boot.todo.model.response.TodoSuccessResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -37,13 +41,9 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import bnymellon.training.spring.boot.todo.model.Todo;
-import bnymellon.training.spring.boot.todo.model.exception.InvalidIdException;
-import bnymellon.training.spring.boot.todo.model.exception.TodoNotFoundException;
-import bnymellon.training.spring.boot.todo.model.response.Metadata;
-import bnymellon.training.spring.boot.todo.model.response.Status;
-import bnymellon.training.spring.boot.todo.model.response.TodoCollectionResponse;
-import bnymellon.training.spring.boot.todo.service.TodoService;
+import bny.training.spring.boot.todo.model.response.Metadata;
+import bny.training.spring.boot.todo.model.response.Status;
+import bny.training.spring.boot.todo.model.response.TodoCollectionResponse;
 
 import java.time.Instant;
 import java.util.Collections;
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/controller/TodoResponseHelper.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/controller/TodoResponseHelper.java
similarity index 88%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/controller/TodoResponseHelper.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/controller/TodoResponseHelper.java
index a1eb9f6..7442ad2 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/controller/TodoResponseHelper.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/controller/TodoResponseHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.controller;
+package bny.training.spring.boot.todo.controller;
 
 
-import bnymellon.training.spring.boot.todo.model.response.Metadata;
-import bnymellon.training.spring.boot.todo.model.response.Status;
+import bny.training.spring.boot.todo.model.response.Metadata;
+import bny.training.spring.boot.todo.model.response.Status;
 import org.springframework.http.HttpStatus;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/dao/TodoRepository.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/dao/TodoRepository.java
similarity index 89%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/dao/TodoRepository.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/dao/TodoRepository.java
index 66bf739..a81c7c1 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/dao/TodoRepository.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/dao/TodoRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.dao;
+package bny.training.spring.boot.todo.dao;
 
 import java.util.List;
 import java.util.Optional;
@@ -23,7 +23,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import bnymellon.training.spring.boot.todo.model.Todo;
+import bny.training.spring.boot.todo.model.Todo;
 
 public interface TodoRepository extends JpaRepository<Todo, Long> {
 
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/Todo.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/Todo.java
similarity index 98%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/Todo.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/Todo.java
index 2607f8e..9f5c146 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/Todo.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/Todo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model;
+package bny.training.spring.boot.todo.model;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/exception/InvalidAssigneeException.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/exception/InvalidAssigneeException.java
similarity index 87%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/exception/InvalidAssigneeException.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/exception/InvalidAssigneeException.java
index e3bf0db..3b4784e 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/exception/InvalidAssigneeException.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/exception/InvalidAssigneeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.exception;
+package bny.training.spring.boot.todo.model.exception;
 
 public class InvalidAssigneeException extends RuntimeException {
     public InvalidAssigneeException(final String message, final String assignee) {
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/exception/InvalidIdException.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/exception/InvalidIdException.java
similarity index 87%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/exception/InvalidIdException.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/exception/InvalidIdException.java
index 2447fbb..f228b60 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/exception/InvalidIdException.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/exception/InvalidIdException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.exception;
+package bny.training.spring.boot.todo.model.exception;
 
 public class InvalidIdException extends RuntimeException {
     public InvalidIdException(final String message, final String todoId) {
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/exception/TodoNotFoundException.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/exception/TodoNotFoundException.java
similarity index 87%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/exception/TodoNotFoundException.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/exception/TodoNotFoundException.java
index fce5715..21261d6 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/exception/TodoNotFoundException.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/exception/TodoNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.exception;
+package bny.training.spring.boot.todo.model.exception;
 
 public class TodoNotFoundException extends RuntimeException {
     public TodoNotFoundException(final String message, final Long todoId) {
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/Issue.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/Issue.java
similarity index 96%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/Issue.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/Issue.java
index e04eb80..3471a86 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/Issue.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/Issue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.response;
+package bny.training.spring.boot.todo.model.response;
 
 import java.io.Serializable;
 
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/Metadata.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/Metadata.java
similarity index 98%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/Metadata.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/Metadata.java
index faed725..217fdf8 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/Metadata.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/Metadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.response;
+package bny.training.spring.boot.todo.model.response;
 
 import java.io.Serializable;
 
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/Status.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/Status.java
similarity index 96%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/Status.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/Status.java
index b414bb0..225d82a 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/Status.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/Status.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.response;
+package bny.training.spring.boot.todo.model.response;
 
 import java.io.Serializable;
 
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoCollectionResponse.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoCollectionResponse.java
similarity index 94%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoCollectionResponse.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoCollectionResponse.java
index c4dac58..ce07a37 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoCollectionResponse.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoCollectionResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.response;
+package bny.training.spring.boot.todo.model.response;
 
 import java.util.List;
 
@@ -23,7 +23,7 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.swagger.annotations.ApiModelProperty;
 
-import bnymellon.training.spring.boot.todo.model.Todo;
+import bny.training.spring.boot.todo.model.Todo;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoErrorResponse.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoErrorResponse.java
similarity index 96%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoErrorResponse.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoErrorResponse.java
index e28fb16..bb998dc 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoErrorResponse.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoErrorResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.response;
+package bny.training.spring.boot.todo.model.response;
 
 import java.util.List;
 
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoResponse.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoResponse.java
similarity index 84%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoResponse.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoResponse.java
index f1dfaca..8bf2851 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoResponse.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.response;
+package bny.training.spring.boot.todo.model.response;
 
 public interface TodoResponse {
 }
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoSuccessResponse.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoSuccessResponse.java
similarity index 93%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoSuccessResponse.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoSuccessResponse.java
index 234d9b3..fb58766 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/model/response/TodoSuccessResponse.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/model/response/TodoSuccessResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.response;
+package bny.training.spring.boot.todo.model.response;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import io.swagger.annotations.ApiModelProperty;
 
-import bnymellon.training.spring.boot.todo.model.Todo;
+import bny.training.spring.boot.todo.model.Todo;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/service/TodoService.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/service/TodoService.java
similarity index 85%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/service/TodoService.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/service/TodoService.java
index c94a734..b274dde 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/service/TodoService.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/service/TodoService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.service;
+package bny.training.spring.boot.todo.service;
 
 import java.util.List;
 
-import bnymellon.training.spring.boot.todo.model.Todo;
+import bny.training.spring.boot.todo.model.Todo;
 
 public interface TodoService {
 
diff --git a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/service/TodoServiceImpl.java b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/service/TodoServiceImpl.java
similarity index 87%
rename from spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/service/TodoServiceImpl.java
rename to spring-boot/todo/src/main/java/bny/training/spring/boot/todo/service/TodoServiceImpl.java
index 236b991..01b3a6e 100644
--- a/spring-boot/todo/src/main/java/bnymellon/training/spring/boot/todo/service/TodoServiceImpl.java
+++ b/spring-boot/todo/src/main/java/bny/training/spring/boot/todo/service/TodoServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.service;
+package bny.training.spring.boot.todo.service;
 
-import bnymellon.training.spring.boot.todo.TodoConstants;
-import bnymellon.training.spring.boot.todo.dao.TodoRepository;
-import bnymellon.training.spring.boot.todo.model.Todo;
-import bnymellon.training.spring.boot.todo.model.exception.InvalidAssigneeException;
-import bnymellon.training.spring.boot.todo.model.exception.InvalidIdException;
-import bnymellon.training.spring.boot.todo.model.exception.TodoNotFoundException;
+import bny.training.spring.boot.todo.TodoConstants;
+import bny.training.spring.boot.todo.dao.TodoRepository;
+import bny.training.spring.boot.todo.model.Todo;
+import bny.training.spring.boot.todo.model.exception.InvalidAssigneeException;
+import bny.training.spring.boot.todo.model.exception.InvalidIdException;
+import bny.training.spring.boot.todo.model.exception.TodoNotFoundException;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
diff --git a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/AbstractTodoMockSetupTest.java b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/AbstractTodoMockSetupTest.java
similarity index 92%
rename from spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/AbstractTodoMockSetupTest.java
rename to spring-boot/todo/src/test/java/bny/training/spring/boot/todo/AbstractTodoMockSetupTest.java
index 9ecdf10..9def622 100644
--- a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/AbstractTodoMockSetupTest.java
+++ b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/AbstractTodoMockSetupTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo;
+package bny.training.spring.boot.todo;
 
-import bnymellon.training.spring.boot.todo.model.Todo;
-import bnymellon.training.spring.boot.todo.model.exception.InvalidAssigneeException;
-import bnymellon.training.spring.boot.todo.model.exception.InvalidIdException;
-import bnymellon.training.spring.boot.todo.model.exception.TodoNotFoundException;
-import bnymellon.training.spring.boot.todo.service.TodoService;
+import bny.training.spring.boot.todo.model.Todo;
+import bny.training.spring.boot.todo.model.exception.InvalidAssigneeException;
+import bny.training.spring.boot.todo.model.exception.InvalidIdException;
+import bny.training.spring.boot.todo.model.exception.TodoNotFoundException;
+import bny.training.spring.boot.todo.service.TodoService;
 import org.springframework.boot.test.mock.mockito.MockBean;
 
 import java.util.Arrays;
diff --git a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/DbTestUtil.java b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/DbTestUtil.java
similarity index 97%
rename from spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/DbTestUtil.java
rename to spring-boot/todo/src/test/java/bny/training/spring/boot/todo/DbTestUtil.java
index c35a715..c3de2e6 100644
--- a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/DbTestUtil.java
+++ b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/DbTestUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo;
+package bny.training.spring.boot.todo;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.env.Environment;
diff --git a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/TodoApplicationTests.java b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/TodoApplicationTests.java
similarity index 89%
rename from spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/TodoApplicationTests.java
rename to spring-boot/todo/src/test/java/bny/training/spring/boot/todo/TodoApplicationTests.java
index cc551c2..01395d6 100644
--- a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/TodoApplicationTests.java
+++ b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/TodoApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo;
+package bny.training.spring.boot.todo;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContractRestTest.java b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/controller/TodoAPIContractRestTest.java
similarity index 96%
rename from spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContractRestTest.java
rename to spring-boot/todo/src/test/java/bny/training/spring/boot/todo/controller/TodoAPIContractRestTest.java
index 2a8cb50..88997d3 100644
--- a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContractRestTest.java
+++ b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/controller/TodoAPIContractRestTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.controller;
+package bny.training.spring.boot.todo.controller;
 
-import bnymellon.training.spring.boot.todo.model.Todo;
-import bnymellon.training.spring.boot.todo.model.exception.InvalidAssigneeException;
-import bnymellon.training.spring.boot.todo.model.exception.InvalidIdException;
-import bnymellon.training.spring.boot.todo.model.exception.TodoNotFoundException;
-import bnymellon.training.spring.boot.todo.service.TodoService;
+import bny.training.spring.boot.todo.TodoConstants;
+import bny.training.spring.boot.todo.model.Todo;
+import bny.training.spring.boot.todo.model.exception.InvalidAssigneeException;
+import bny.training.spring.boot.todo.model.exception.InvalidIdException;
+import bny.training.spring.boot.todo.model.exception.TodoNotFoundException;
+import bny.training.spring.boot.todo.service.TodoService;
 import io.restassured.path.json.JsonPath;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -39,10 +40,7 @@
 
 import java.util.Arrays;
 
-import static bnymellon.training.spring.boot.todo.TodoConstants.INVALID_ASSIGNEE_LENGTH_MESSAGE;
-import static bnymellon.training.spring.boot.todo.TodoConstants.INVALID_ID_MESSAGE;
-import static bnymellon.training.spring.boot.todo.TodoConstants.INVALID_NULL_ASSIGNEE_MESSAGE;
-import static bnymellon.training.spring.boot.todo.TodoConstants.TODO_NOT_FOUND_EXCEPTION;
+import static bny.training.spring.boot.todo.TodoConstants.*;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;
@@ -720,7 +718,7 @@ public void deleteNonExistentTodo() throws Exception {
                 "The Issue Message should be [A Todo with id [7] was not found.]");
 /*
 
-        String errorMessage = String.format(TodoConstants.TODO_NOT_FOUND_EXCEPTION, "7");
+        String errorMessage = String.format(TODO_NOT_FOUND_EXCEPTION, "7");
 
         given()
                 .port(port)
diff --git a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContractTest.java b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/controller/TodoAPIContractTest.java
similarity index 91%
rename from spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContractTest.java
rename to spring-boot/todo/src/test/java/bny/training/spring/boot/todo/controller/TodoAPIContractTest.java
index 704e14a..3b08a8b 100644
--- a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/controller/TodoAPIContractTest.java
+++ b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/controller/TodoAPIContractTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.controller;
+package bny.training.spring.boot.todo.controller;
 
-import bnymellon.training.spring.boot.todo.AbstractTodoMockSetupTest;
-import bnymellon.training.spring.boot.todo.model.Todo;
-import bnymellon.training.spring.boot.todo.model.exception.InvalidAssigneeException;
-import bnymellon.training.spring.boot.todo.model.exception.InvalidIdException;
-import bnymellon.training.spring.boot.todo.model.exception.TodoNotFoundException;
-import bnymellon.training.spring.boot.todo.model.response.TodoCollectionResponse;
-import bnymellon.training.spring.boot.todo.model.response.TodoSuccessResponse;
+import bny.training.spring.boot.todo.AbstractTodoMockSetupTest;
+import bny.training.spring.boot.todo.model.Todo;
+import bny.training.spring.boot.todo.model.exception.InvalidAssigneeException;
+import bny.training.spring.boot.todo.model.exception.InvalidIdException;
+import bny.training.spring.boot.todo.model.exception.TodoNotFoundException;
+import bny.training.spring.boot.todo.model.response.TodoCollectionResponse;
+import bny.training.spring.boot.todo.model.response.TodoSuccessResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/dao/TodoRepositoryTest.java b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/dao/TodoRepositoryTest.java
similarity index 96%
rename from spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/dao/TodoRepositoryTest.java
rename to spring-boot/todo/src/test/java/bny/training/spring/boot/todo/dao/TodoRepositoryTest.java
index 4b74060..9b7ef66 100644
--- a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/dao/TodoRepositoryTest.java
+++ b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/dao/TodoRepositoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.dao;
+package bny.training.spring.boot.todo.dao;
 
-import bnymellon.training.spring.boot.todo.TodoApplication;
+import bny.training.spring.boot.todo.TodoApplication;
 import com.github.springtestdbunit.DbUnitTestExecutionListener;
 import com.github.springtestdbunit.annotation.DatabaseOperation;
 import com.github.springtestdbunit.annotation.DatabaseSetup;
diff --git a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/TodoTest.java b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/TodoTest.java
similarity index 97%
rename from spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/TodoTest.java
rename to spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/TodoTest.java
index adfc00d..7ed905d 100644
--- a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/TodoTest.java
+++ b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/TodoTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model;
+package bny.training.spring.boot.todo.model;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/IssueTest.java b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/IssueTest.java
similarity index 95%
rename from spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/IssueTest.java
rename to spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/IssueTest.java
index 0c6f720..ce593ee 100644
--- a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/IssueTest.java
+++ b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/IssueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.response;
+package bny.training.spring.boot.todo.model.response;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/MetadataTest.java b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/MetadataTest.java
similarity index 97%
rename from spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/MetadataTest.java
rename to spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/MetadataTest.java
index e6861d8..132a17d 100644
--- a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/MetadataTest.java
+++ b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/MetadataTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.response;
+package bny.training.spring.boot.todo.model.response;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/StatusTest.java b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/StatusTest.java
similarity index 95%
rename from spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/StatusTest.java
rename to spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/StatusTest.java
index 14ff144..5337307 100644
--- a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/StatusTest.java
+++ b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/StatusTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.response;
+package bny.training.spring.boot.todo.model.response;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/TodoCollectionResponseTest.java b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/TodoCollectionResponseTest.java
similarity index 96%
rename from spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/TodoCollectionResponseTest.java
rename to spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/TodoCollectionResponseTest.java
index 8437bf4..1fb6c11 100644
--- a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/TodoCollectionResponseTest.java
+++ b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/TodoCollectionResponseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.response;
+package bny.training.spring.boot.todo.model.response;
 
 import java.util.Collections;
 
-import bnymellon.training.spring.boot.todo.model.Todo;
+import bny.training.spring.boot.todo.model.Todo;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/TodoErrorResponseTest.java b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/TodoErrorResponseTest.java
similarity index 97%
rename from spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/TodoErrorResponseTest.java
rename to spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/TodoErrorResponseTest.java
index bfdaea0..896b020 100644
--- a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/TodoErrorResponseTest.java
+++ b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/TodoErrorResponseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.response;
+package bny.training.spring.boot.todo.model.response;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/TodoSuccessResponseTest.java b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/TodoSuccessResponseTest.java
similarity index 96%
rename from spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/TodoSuccessResponseTest.java
rename to spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/TodoSuccessResponseTest.java
index a6fd17c..115e2a7 100644
--- a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/model/response/TodoSuccessResponseTest.java
+++ b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/model/response/TodoSuccessResponseTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.model.response;
+package bny.training.spring.boot.todo.model.response;
 
-import bnymellon.training.spring.boot.todo.model.Todo;
+import bny.training.spring.boot.todo.model.Todo;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
diff --git a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/service/TodoServiceTest.java b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/service/TodoServiceTest.java
similarity index 93%
rename from spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/service/TodoServiceTest.java
rename to spring-boot/todo/src/test/java/bny/training/spring/boot/todo/service/TodoServiceTest.java
index 244077e..9357261 100644
--- a/spring-boot/todo/src/test/java/bnymellon/training/spring/boot/todo/service/TodoServiceTest.java
+++ b/spring-boot/todo/src/test/java/bny/training/spring/boot/todo/service/TodoServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.boot.todo.service;
+package bny.training.spring.boot.todo.service;
 
-import bnymellon.training.spring.boot.todo.TodoConstants;
-import bnymellon.training.spring.boot.todo.dao.TodoRepository;
-import bnymellon.training.spring.boot.todo.model.Todo;
-import bnymellon.training.spring.boot.todo.model.exception.InvalidAssigneeException;
-import bnymellon.training.spring.boot.todo.model.exception.InvalidIdException;
-import bnymellon.training.spring.boot.todo.model.exception.TodoNotFoundException;
+import bny.training.spring.boot.todo.dao.TodoRepository;
+import bny.training.spring.boot.todo.model.Todo;
+import bny.training.spring.boot.todo.model.exception.InvalidAssigneeException;
+import bny.training.spring.boot.todo.model.exception.InvalidIdException;
+import bny.training.spring.boot.todo.model.exception.TodoNotFoundException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/spring-framework/assets/docs/01_InversionOfControl.adoc b/spring-framework/assets/docs/01_InversionOfControl.adoc
index 2c85933..798995a 100644
--- a/spring-framework/assets/docs/01_InversionOfControl.adoc
+++ b/spring-framework/assets/docs/01_InversionOfControl.adoc
@@ -29,10 +29,10 @@ Let us walk through a few examples that show how *Inversion of Control* is possi
 == Java Example without Spring
 
 1. We use a model +
-⇒ link:../../ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java[ColoredShape.java].
+⇒ link:../../ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/model/ColoredShape.java[ColoredShape.java].
 
 2. A plain Java example with no spring used +
-⇒ link:../../ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex00_NoFrameworkExample.java[Ex00_NoFrameworkExample.java].
+⇒ link:../../ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex00_NoFrameworkExample.java[Ex00_NoFrameworkExample.java].
 
 3. In order to produce a different color and shape, *_either_*, the command line arguments *_or_*, the java code needs to be manipulated.
 
@@ -57,10 +57,10 @@ Let us walk through a few examples that show how *Inversion of Control* is possi
 === Example 1 - Using Spring with Constructor Instantiation
 
 1. For the model, we have two model objects to look at +
-⇒ link:../../ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java[ColoredShape.java]
+⇒ link:../../ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/model/ColoredShape.java[ColoredShape.java]
 
 2. Here is an example of using Spring with a constructor instantiating the value +
-⇒ link:../../ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex01_InstantiationThroughConstructor.java[Ex01_InstantiationThroughConstructor.java] +
+⇒ link:../../ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex01_InstantiationThroughConstructor.java[Ex01_InstantiationThroughConstructor.java] +
 This class has a `ClassPathXmlApplicationContext` which reads the XML configuration. The
 `ApplicationContext` is the Spring Inversion of Control. The `main` method transfers control of
 loading beans to the `ClassPathXmlApplicationContext`, which then loads _beans_ from the XML file.
@@ -82,7 +82,7 @@ loading beans to the `ClassPathXmlApplicationContext`, which then loads _beans_
 === Example 2 - Using Spring with Static Factory Instantiation
 
 1. Here is an example of using Spring with a static factory instantiating the value +
-⇒ link:../../ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex02_InstantiationThroughStaticFactory.java[Ex02_InstantiationThroughStaticFactory]. +
+⇒ link:../../ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex02_InstantiationThroughStaticFactory.java[Ex02_InstantiationThroughStaticFactory]. +
 A static method, `getInstance()` is a supplier of a `ColoredShape` instance.
 
 2. Here is the configuration for this Spring class +
@@ -104,7 +104,7 @@ configure the properties.
 === Example 3 - Using Spring with Instance Factory Instantiation
 
 1. Here is an example of using Spring with an instance factory instantiating the value +
-⇒ link:../../ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex03_InstantiationThroughInstanceFactory.java[Ex03_InstantiationThroughInstanceFactory.java]. +
+⇒ link:../../ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex03_InstantiationThroughInstanceFactory.java[Ex03_InstantiationThroughInstanceFactory.java]. +
 An instance method `getInstance()` is a supplier of the `ColoredShape` instance. The `constructor`
 is first called to create the class, the `ClassPathXmlApplicationContext` then parses the XML to
 configure the _bean_.
@@ -136,7 +136,7 @@ image:../../../assets/images/labtime.png[Lab, align="center"]
 The lab exercise is to fix the broken tests. Follow the instructions to fix the TODOs to get the
 JUnit test to pass.
 
-⇒ link:../../ch01_spring-inversion-of-control/src/test/java/bnymellon/training/spring/framework/Lab01Test.java[Lab01Test.java].
+⇒ link:../../ch01_spring-inversion-of-control/src/test/java/bny/training/spring/framework/Lab01Test.java[Lab01Test.java].
 
 '''
 
diff --git a/spring-framework/assets/docs/02_DependencyInjection.adoc b/spring-framework/assets/docs/02_DependencyInjection.adoc
index 62dd5f2..8bfb052 100644
--- a/spring-framework/assets/docs/02_DependencyInjection.adoc
+++ b/spring-framework/assets/docs/02_DependencyInjection.adoc
@@ -42,11 +42,11 @@ The previous chapter detailed how Spring loads XML to manage bean configurations
 basic example of Spring using the default constructor to instantiate a bean.
 
 1. For the model, we have two model objects to look at +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java[ColoredShape.java] +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ColoredShapeHolder.java[ColoredShapeHolder.java]
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ColoredShape.java[ColoredShape.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ColoredShapeHolder.java[ColoredShapeHolder.java]
 
 2. A plain Java example with no spring used +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/Ex00_NoFrameworkExample.java[Ex00_NoFrameworkExample.java].
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/Ex00_NoFrameworkExample.java[Ex00_NoFrameworkExample.java].
 
 3. Several instances of `ColoredShapeHolder` are created in this example.
 
@@ -75,7 +75,7 @@ This example demonstrates a loading of a bean with a default constructor call. N
 are set. The XML configuration simply instantiates a bean to be made available to the holder.
 
 1. The Java code to execute +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex01_DIThroughConstructorSimple.java[Ex01_DIThroughConstructorSimple.java]. +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex01_DIThroughConstructorSimple.java[Ex01_DIThroughConstructorSimple.java]. +
 This class has a `ClassPathXmlApplicationContext` which reads the XML configuration. The
 `ApplicationContext` is the Spring Inversion of Control. The `main` method transfers control of
 loading beans to the `ClassPathXmlApplicationContext`, which then loads _beans_ from the XML file.
@@ -83,8 +83,8 @@ The XML file provides an injection of a `ColoredShape` _bean_ into a `ColoredSha
 via *_Constructor Injection_* based on *determining the types of arguments*.
 
 2. The Java code for the model loaded from the XML file +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java[ColoredShape.java]. +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ColoredShapeHolder.java[ColoredShapeHolder.java].
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ColoredShape.java[ColoredShape.java]. +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ColoredShapeHolder.java[ColoredShapeHolder.java].
 
 3. Here is the XML configuration for this Spring class +
 ⇒ link:../../ch02_spring-dependency-injection/src/main/resources/ex01-di-through-constructor-simple.xml[ex01-di-through-constructor-simple.xml].
@@ -108,7 +108,7 @@ arguments represent the parameter names. The XML configuration simply instantiat
 made available to the holder and sets constructor values based on the names.
 
 1. The Java code to execute +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex02_DIThroughConstructorNamed.java[Ex02_DIThroughConstructorNamed.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex02_DIThroughConstructorNamed.java[Ex02_DIThroughConstructorNamed.java] +
 This class has a `ClassPathXmlApplicationContext` which reads the XML configuration. The
 `ApplicationContext` is the Spring Inversion of Control. The `main` method transfers control of
 loading beans to the `ClassPathXmlApplicationContext`, which then loads _beans_ from the XML file.
@@ -137,7 +137,7 @@ arguments represent the parameter indices. The XML configuration simply instanti
 bean to be made available to the holder.
 
 1. The Java code to execute +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex03_DIThroughConstructorIndex.java[Ex03_DIThroughConstructorIndex.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex03_DIThroughConstructorIndex.java[Ex03_DIThroughConstructorIndex.java] +
 This class has a `ClassPathXmlApplicationContext` which reads the XML configuration. The
 `ApplicationContext` is the Spring Inversion of Control. The `main` method transfers control of
 loading beans to the `ClassPathXmlApplicationContext`, which then loads _beans_ from the XML file.
@@ -166,7 +166,7 @@ includes a named attribute of each bean property. The XML configuration simply i
 to be made available to the holder.
 
 1. The Java code to execute +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex04_DIThroughSetters.java[Ex04_DIThroughSetters.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex04_DIThroughSetters.java[Ex04_DIThroughSetters.java] +
 This class has a `ClassPathXmlApplicationContext` which reads the XML configuration. The
 `ApplicationContext` is the Spring Inversion of Control. The `main` method transfers control of
 loading beans to the `ClassPathXmlApplicationContext`, which then loads _beans_ from the XML file.
@@ -200,7 +200,7 @@ includes a named attribute of each bean property. The XML configuration simply i
 to be made available to the holder. The ColoredShape is NOT passed to the ColoredShapeHolder.
 
 1. The Java code to execute +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/annotation/Ex05_DIThroughAnnotationSetters.java[Ex05_DIThroughAnnotationSetters.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/annotation/Ex05_DIThroughAnnotationSetters.java[Ex05_DIThroughAnnotationSetters.java] +
 This class loads beans via an XML and then invokes a `SetterAnnotatedColoredShapeHolder`.
 
 2. Here is the XML configuration for this Spring class +
@@ -210,7 +210,7 @@ to the `beans` schema, and the addition of a `<context:annotation-config/>` exce
 of the schemas and the declaration of this excerpt are important to process annotations.
 
 3. The Java Code that injects the dependency +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/SetterAnnotatedColoredShapeHolder.java[SetterAnnotatedColoredShapeHolder.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/SetterAnnotatedColoredShapeHolder.java[SetterAnnotatedColoredShapeHolder.java] +
 This class has an `@Autowired` annotation for the `setColoredShape()`. The XML file defines the
 beans that are loaded via the `ClassPathXmlApplicationContext`. This part creates a registry of
 beans. The `SetterAnnotatedColoredShapeHolder` has the `@Autowired` annotation on the setter,
@@ -231,7 +231,7 @@ includes a named attribute of each bean property. The XML configuration simply i
 to be made available to the holder. The ColoredShape is NOT passed to the ColoredShapeHolder.
 
 1. The Java code to execute +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/annotation/Ex06_DIThroughAnnotationConstructor.java[Ex06_DIThroughAnnotationConstructor.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/annotation/Ex06_DIThroughAnnotationConstructor.java[Ex06_DIThroughAnnotationConstructor.java] +
 This class loads beans via an XML and then invokes a `ConstructorAnnotatedColoredShapeHolder`.
 
 2. Here is the XML configuration for this Spring class +
@@ -241,7 +241,7 @@ to the `beans` schema, and the addition of a `<context:annotation-config/>` exce
 of the schemas and the declaration of this excerpt are important to process annotations.
 
 3. The Java Code that injects the dependency +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ConstructorAnnotatedColoredShapeHolder.java[ConstructorAnnotatedColoredShapeHolder.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ConstructorAnnotatedColoredShapeHolder.java[ConstructorAnnotatedColoredShapeHolder.java] +
 This class has an `@Autowired` annotation for the constructor. The XML file defines the beans that
 are loaded via the `ClassPathXmlApplicationContext`. This part creates a registry of beans. The
 `ConstructorAnnotatedColoredShapeHolder` has the `@Autowired` annotation on the constructor, which
@@ -263,7 +263,7 @@ to be made available to the holder and includes a qualifier. The ColoredShape is
 the ColoredShapeHolder.
 
 1. The Java code to execute +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/annotation/Ex07_DIThroughAnnotationWithQualifiers.java[Ex07_DIThroughAnnotationWithQualifiers.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/annotation/Ex07_DIThroughAnnotationWithQualifiers.java[Ex07_DIThroughAnnotationWithQualifiers.java] +
 This class loads beans via an XML and then invokes a `ConstructorAnnotatedQualifiedColoredShapeHolder`.
 
 2. Here is the XML configuration for this Spring class +
@@ -275,7 +275,7 @@ and the addition of a `<context:annotation-config/>` excerpt. The addition of th
 declaration of this excerpt are important to process annotations.
 
 3. The Java Code that injects the dependency +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ConstructorAnnotatedQualifiedColoredShapeHolder.java[ConstructorAnnotatedQualifiedColoredShapeHolder.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ConstructorAnnotatedQualifiedColoredShapeHolder.java[ConstructorAnnotatedQualifiedColoredShapeHolder.java] +
 This class has an `@Autowired` annotation for the constructor. The Constructor parameter also has
 an annotation of a `Qualifier` which specifies that the bean to load uses the *`thePinkPolygon`*
 bean, and *_not the aColoredShape_*. The XML file defines the beans that are loaded via the
@@ -305,9 +305,9 @@ classes as first class beans. Any classes marked with a stereotype indicates tha
 bean are picked into the context.
 
 1. The Java code to execute +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/java/Ex08_DIThroughJava.java[Ex08_DIThroughJava.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/java/Ex08_DIThroughJava.java[Ex08_DIThroughJava.java] +
 This class has an annotation to `@ComponentScan` all Spring-annotated classes in the
-`bnymellon.training.spring.framework.model` package. This is the Java equivalent of creating bean
+`bny.training.spring.framework.model` package. This is the Java equivalent of creating bean
 definitions in XML. Notice how the @ComponentScan points to a base package to scan, Spring picks up
 all classes marked as a `@Component` from the base package. Notice the use of an
 `AnnotationConfigApplicationContext` to load the context beans via annotations. Since we do not
@@ -317,14 +317,14 @@ Spring-related beans.
 
 2. A few model classes are created that contain the `@Component` annotation informing Spring to
 load them up as beans.
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/BlackBox.java[BlackBox.java].
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/OrangeOval.java[OrangeOval.java]. +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/BlackBox.java[BlackBox.java].
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/OrangeOval.java[OrangeOval.java]. +
 Notice there are other `ColoredShape` classes that are *NOT* loaded into the Spring context, since
 they are not marked with the `@Component` annotation. Examples include `CyanCylinder` and
 `RedRectangle`.
 
 3. The Java code that autowires +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/AutowiredColoredShapeHolder.java[AutowiredColoredShapeHolder.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/AutowiredColoredShapeHolder.java[AutowiredColoredShapeHolder.java] +
 This class autowires the constructor to look for an instance of `OrangeOval` in the context.
 The AutowiredColoredShapeHolder itself picks up the OrangeOval loaded during the component scan.
 Since only one instance is declared, it is found and auto-wired in.
@@ -345,13 +345,13 @@ the parameter. Any class marked with @Configuration annotation (this annotation
 stereotype), indicate that it replaces XML configurations previously discussed.
 
 1. The Java code to execute +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/java/Ex09_DIThroughJavaConfiguration.java[Ex09_DIThroughJavaConfiguration.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/java/Ex09_DIThroughJavaConfiguration.java[Ex09_DIThroughJavaConfiguration.java] +
 This class uses the same `AnnotationConfigApplicationContext` as used in the previous example.
 Since the configuration points to a specific Java class, it can skip the need to register and
 refresh. The `ColoredShapeHolder` instance is retrieved by name from the context.
 
 2. The Java code that provides the configurations +
-⇒ link:../../ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/DIConfiguration.java[DIConfiguration.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/DIConfiguration.java[DIConfiguration.java] +
 This class provides the beans (with their names) of *tealtrapezoid*, *tealTrapezoidHolder* and
 *redRectangleHolder* to be loaded into the Spring context.
 
@@ -370,9 +370,9 @@ image:../../../assets/images/labtime.png[Lab, align="center"]
 The lab exercise is to fix the broken tests. Follow the instructions to fix the TODOs to get the
 JUnit test to pass.
 
-⇒ link:../../ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/xml/Lab01Test.java[xml/Lab01Test.java] +
-⇒ link:../../ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/annotation/Lab02Test.java[annotation/Lab02Test.java] +
-⇒ link:../../ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/model[model package]
+⇒ link:../../ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/xml/Lab01Test.java[xml/Lab01Test.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/annotation/Lab02Test.java[annotation/Lab02Test.java] +
+⇒ link:../../ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/model[model package]
 
 '''
 
diff --git a/spring-framework/assets/docs/03_Testing.adoc b/spring-framework/assets/docs/03_Testing.adoc
index 2037a60..0da1f6b 100644
--- a/spring-framework/assets/docs/03_Testing.adoc
+++ b/spring-framework/assets/docs/03_Testing.adoc
@@ -63,7 +63,7 @@ This example demonstrates using a *default XML context* for testing code. This u
 the test class with a suffix of `-context.xml` under the resources.
 
 1. The JUnit test +
-⇒ link:../../ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Ex01_DefaultXMLContextConfiguration.java[Ex01_DefaultXMLContextConfiguration.java] +
+⇒ link:../../ch03_spring-testing/src/test/java/bny/training/spring/framework/Ex01_DefaultXMLContextConfiguration.java[Ex01_DefaultXMLContextConfiguration.java] +
 This class is a JUnit test marked with an annotation `@ContextConfiguration`. This annotation
 hints at looking for an XML file with the same name (and under the same package), suffixed with
 `-context.xml`. Thus running the class will cause Spring to search for a file named
@@ -71,7 +71,7 @@ hints at looking for an XML file with the same name (and under the same package)
 should it be located.
 
 2. The XML file +
-⇒ link:../../ch03_spring-testing/src/test/resources/bnymellon/training/spring/framework/Ex01_DefaultXMLContextConfiguration-context.xml[Ex01_DefaultXMLContextConfiguration-context.xml] +
+⇒ link:../../ch03_spring-testing/src/test/resources/bny/training/spring/framework/Ex01_DefaultXMLContextConfiguration-context.xml[Ex01_DefaultXMLContextConfiguration-context.xml] +
 The default context configuration file (same package, name matches the Java class and adds a `-context.xml`).
 
 The `@ContextConfiguration` without any arguments will look for an XML file in the same package
@@ -89,7 +89,7 @@ This example demonstrates using a *custom XML context* for testing code. This us
 the XML passed into as the location attribute.
 
 1. The JUnit test +
-⇒ link:../../ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Ex02_CustomXMLContextConfiguration.java[Ex02_CustomXMLContextConfiguration.java] +
+⇒ link:../../ch03_spring-testing/src/test/java/bny/training/spring/framework/Ex02_CustomXMLContextConfiguration.java[Ex02_CustomXMLContextConfiguration.java] +
 This class is a JUnit test marked with an annotation `@ContextConfiguration`. This annotation now
 includes a `locations` attribute, specifying the *XML file to load the context from*. Thus running
 the class will cause Spring to search for the file on the classpath, and load beans from the XML
@@ -113,14 +113,14 @@ This example demonstrates using a Java configuration context for testing code. T
 the context is loaded from a Java class marked with the `@Configuration` annotation.
 
 1. The JUnit test +
-⇒ link:../../ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Ex03_JavaContextConfiguration.java[Ex03_JavaContextConfiguration.java] +
+⇒ link:../../ch03_spring-testing/src/test/java/bny/training/spring/framework/Ex03_JavaContextConfiguration.java[Ex03_JavaContextConfiguration.java] +
 This class is a JUnit test marked with an annotation `@ContextConfiguration`. This annotation
 now includes a `classes` attribute, specifying the *class to load the context from*. Thus running
 the class will cause Spring to search for the file on the classpath, and load beans from the XML
 file, should it be located.
 
 2. The Configuration class +
-⇒ link:../../ch03_spring-testing/src/main/java/bnymellon/training/spring/framework/model/DIConfiguration.java[DIConfiguration.java] +
+⇒ link:../../ch03_spring-testing/src/main/java/bny/training/spring/framework/model/DIConfiguration.java[DIConfiguration.java] +
 This class is located under the *main* module and is scanned during the launch of the test code,
 and loads the beans defined in the class, into the context.
 
@@ -140,9 +140,9 @@ image:../../../assets/images/labtime.png[Lab, align="center"]
 The lab exercise is to fix the broken tests. Follow the instructions to fix the TODOs to get the
 JUnit test to pass.
 
-⇒ link:../../ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Lab01Test.java[Lab01Test.java] +
-⇒ link:../../ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Lab02Test.java[Lab02Test.java] +
-⇒ link:../../ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Lab03Test.java[Lab03Test.java]
+⇒ link:../../ch03_spring-testing/src/test/java/bny/training/spring/framework/Lab01Test.java[Lab01Test.java] +
+⇒ link:../../ch03_spring-testing/src/test/java/bny/training/spring/framework/Lab02Test.java[Lab02Test.java] +
+⇒ link:../../ch03_spring-testing/src/test/java/bny/training/spring/framework/Lab03Test.java[Lab03Test.java]
 
 
 '''
diff --git a/spring-framework/assets/docs/04_PersistenceWithJDBC.adoc b/spring-framework/assets/docs/04_PersistenceWithJDBC.adoc
index 885fa19..b747a61 100644
--- a/spring-framework/assets/docs/04_PersistenceWithJDBC.adoc
+++ b/spring-framework/assets/docs/04_PersistenceWithJDBC.adoc
@@ -50,12 +50,12 @@ Creating the database tables. +
 Seeding the database table with data.
 
 . Including a new identifier attribute `id` into the `ColoredShape`. +
-⇒ link:../../ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java[ColoredShape.java] +
+⇒ link:../../ch04_spring-persistence/src/main/java/bny/training/spring/framework/model/ColoredShape.java[ColoredShape.java] +
 Model for the Colored Shape
 
 . Creating an interface to abstract the methods of the *Data Access Object*. Check the
 Create-Read-Update-Delete (*CRUD*) operations. +
-⇒ link:../../ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java[ColoredShapeDao.java] +
+⇒ link:../../ch04_spring-persistence/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java[ColoredShapeDao.java] +
 DAO interface to communicate with the database.
 
 NOTE: Using System.out.println(...), is generally a very bad idea, it is only used here to
@@ -68,7 +68,7 @@ one, to produce a reusable test environment.
 This example demonstrates using an XML context for persistence.
 
 . The main class to run: +
-⇒ link:../../ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/Ex01_DB_XMLConfigured.java[Ex01_DB_XMLConfigured.java] +
+⇒ link:../../ch04_spring-persistence/src/main/java/bny/training/spring/framework/Ex01_DB_XMLConfigured.java[Ex01_DB_XMLConfigured.java] +
 This class loads the `spring-config.xml` using a `ClassPathXmlApplicationContext`. A
 `ColoredShapeDao` is picked from the Spring context and the CRUD calls are made via the DAO.
 
@@ -79,7 +79,7 @@ from the two SQL files. This is done via `jdbc:scripts`.
 
 . The _Data Access Object_ performs the tasks of operating with the database. The class used for
 this example implements the `ColoredShapeDao` interface. +
-⇒ link:../../ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImplEx01.java[ColoredShapeDaoImplEx01.java] +
+⇒ link:../../ch04_spring-persistence/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImplEx01.java[ColoredShapeDaoImplEx01.java] +
 This class is an implementation of the `ColoredShapeDao` interface. All CRUD methods are
 implemented. The DAO implementation also defines a `RowMapper`, as a `ColoredShapeMapper`, that
 maps a `ResultSet` to a `ColoredShape` Java object. The XML config passes in the `dataSource` as a
@@ -111,20 +111,20 @@ Object (DAO), so the DAO can invoke data operations on the dataSource.
 This example demonstrates using an Java context for persistence.
 
 . The main class to run: +
-⇒ link:../../ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/Ex02_DB_JavaConfigured.java[Ex02_DB_JavaConfigured.java] +
+⇒ link:../../ch04_spring-persistence/src/main/java/bny/training/spring/framework/Ex02_DB_JavaConfigured.java[Ex02_DB_JavaConfigured.java] +
 This class loads the `@Configuration` via _ComponentScan_ using an
 `AnnotationConfigApplicationContext`. A `ColoredShapeDao` is picked from the Spring context, and the
 CRUD calls are made via the DAO.
 
 . The Java-based configuration is scanned via the `@ComponentScan`: +
-⇒ link:../../ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/model/DBConfiguration.java[DBConfiguration.java] +
+⇒ link:../../ch04_spring-persistence/src/main/java/bny/training/spring/framework/model/DBConfiguration.java[DBConfiguration.java] +
 The Java configuration declares an embedded database as a dataSource. The dataSource is an important
 bean in persistence. An autowiring of this dataSource to the Data Access Object (DAO), allows
 the DAO to invoke data operations on the dataSource.
 
 . The _Data Access Object_ performs the tasks of operating with the database. The class used for
 this example implements the `ColoredShapeDao` interface. +
-⇒ link:../../ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImplEx02.java[ColoredShapeDaoImplEx02.java] +
+⇒ link:../../ch04_spring-persistence/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImplEx02.java[ColoredShapeDaoImplEx02.java] +
 This class is an implementation of the `ColoredShapeDao` interface. All CRUD methods are
 implemented. The DAO implementation also defines a `RowMapper`, as a `ColoredShapeMapper`, that
 maps a `ResultSet` to a `ColoredShape` Java object. An `@Autowired` annotation on the constructor
diff --git a/spring-framework/assets/docs/05_PersistenceWithHibernate.adoc b/spring-framework/assets/docs/05_PersistenceWithHibernate.adoc
index 7247778..b3a52ea 100644
--- a/spring-framework/assets/docs/05_PersistenceWithHibernate.adoc
+++ b/spring-framework/assets/docs/05_PersistenceWithHibernate.adoc
@@ -45,7 +45,7 @@ to more than one location such as a database, email, file, message bus etc. Henc
 ⇒ link:../../ch05_spring-hibernate/src/main/resources/logback.xml[logback.xml]
 
 - Logging use +
-⇒ link:../../ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeControllingBean.java[ColoredShapeControllingBean.java]
+⇒ link:../../ch05_spring-hibernate/src/main/java/bny/training/spring/framework/controller/ColoredShapeControllingBean.java[ColoredShapeControllingBean.java]
 
 == Introduction to Hibernate
 Covering a full course on Hibernate is definitely out of scope of this tutorial. A brief set of
@@ -81,26 +81,26 @@ This example demonstrates persistence with Hibernate.
  Look for `spring-jdbc`, `spring-orm` and `hibernate-core`. The embedded database is `h2`.
 
 . Embedded H2 Database +
-⇒ link:../../ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/config/HibernateSessionConfig.java[HibernateSessionConfig.java] +
+⇒ link:../../ch05_spring-hibernate/src/main/java/bny/training/spring/framework/config/HibernateSessionConfig.java[HibernateSessionConfig.java] +
 Check the `getDataSource()` method.
 
 . External properties configuration +
-⇒ link:../../ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/config/HibernateSessionConfig.java[HibernateSessionConfig.java] +
+⇒ link:../../ch05_spring-hibernate/src/main/java/bny/training/spring/framework/config/HibernateSessionConfig.java[HibernateSessionConfig.java] +
 Check the `@PropertySource` above the class name.
 
 . External properties +
 ⇒ link:../../ch05_spring-hibernate/src/main/resources/application.properties[application.properties]
 
 . Loading external properties +
-⇒ link:../../ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/config/HibernateSessionConfig.java[HibernateSessionConfig.java] +
+⇒ link:../../ch05_spring-hibernate/src/main/java/bny/training/spring/framework/config/HibernateSessionConfig.java[HibernateSessionConfig.java] +
 Check the `getHibernateProperties()` method.
 
 . Transaction manager +
-⇒ link:../../ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/config/HibernateSessionConfig.java[HibernateSessionConfig.java] +
+⇒ link:../../ch05_spring-hibernate/src/main/java/bny/training/spring/framework/config/HibernateSessionConfig.java[HibernateSessionConfig.java] +
 Check the `getSessionFactory()` method.
 
 . Component scan +
-⇒ link:../../ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java[ColoredShapeConfig.java] +
+⇒ link:../../ch05_spring-hibernate/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java[ColoredShapeConfig.java] +
 The class is declared as `@Configuration` and specifies a `@ComponentScan` instruction against the
 base package.
 
@@ -121,38 +121,38 @@ changes.
 This example demonstrates persistence with Hibernate.
 
 . *Application* - the executable to launch +
-⇒ link:../../ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/ColoredShapeApplication.java[ColoredShapeApplication.java] +
+⇒ link:../../ch05_spring-hibernate/src/main/java/bny/training/spring/framework/ColoredShapeApplication.java[ColoredShapeApplication.java] +
 The example class loads the Spring context via an `AnnotationConfigApplicationContext`.
 
 . *Config* layer - the configuration layer +
-⇒ link:../../ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java[ColoredShapeConfig.java] +
+⇒ link:../../ch05_spring-hibernate/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java[ColoredShapeConfig.java] +
 The config class is supplied. This config class specifies the packages to be scanned for components. +
-⇒ link:../../ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/config/HibernateSessionConfig.java[HibernateSessionConfig.java] +
+⇒ link:../../ch05_spring-hibernate/src/main/java/bny/training/spring/framework/config/HibernateSessionConfig.java[HibernateSessionConfig.java] +
 The class sets up the Hibernate Session Factory bean to create a connection to the database.
 
 . *Controller* layer +
-⇒ link:../../ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeControllingBean.java[ColoredShapeControllingBean.java] +
+⇒ link:../../ch05_spring-hibernate/src/main/java/bny/training/spring/framework/controller/ColoredShapeControllingBean.java[ColoredShapeControllingBean.java] +
 The class auto-wires a `ColoredShapeService` interface, the Spring context has a
 `ColoredShapeServiceImpl` that will be used as an auto-wired instance (remember the *Liskov
 Substitution Principle*). The controller invokes the service methods to persist and retrieve
 ColoredShape instances. The class is marked with a `@Component` annotation.
 
 . *Service* layer +
-⇒ link:../../ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java[ColoredShapeServiceImpl.java] +
+⇒ link:../../ch05_spring-hibernate/src/main/java/bny/training/spring/framework/service/ColoredShapeServiceImpl.java[ColoredShapeServiceImpl.java] +
 The class is marked with a `@Service` annotation. The `@Service` is an alias for the `@Component`
 annotation (see the code). It should display a `@AliasFor(annotation = Component.class)`. The
 service implementation auto-wires a `ColoredShapeDao` interface and will access the
 `ColoredShapeDaoImpl` via the spring context. Methods in the service delegate to methods in the DAO.
 
 . *DAO* layer +
-⇒ link:../../ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImpl.java[ColoredShapeDaoImpl.java] +
+⇒ link:../../ch05_spring-hibernate/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImpl.java[ColoredShapeDaoImpl.java] +
 The class is marked with a `@Repository` annotation. The `@Repository` annotation is an alias for
 the `@Component` annotation. It too should have a `@AliasFor(annotation = Component.class)`. The
 DAO implementation uses an instance of the `SessionFactory` to communicate with the database.
 Similar to the service, the DAO interface is wired with an implementation via the Spring context.
 
 . *Model* layer +
-⇒ link:../../ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java[ColoredShape.java] +
+⇒ link:../../ch05_spring-hibernate/src/main/java/bny/training/spring/framework/model/ColoredShape.java[ColoredShape.java] +
 This is the model for ColoredShape. The `id` attribute maps to a *primary key* in the *database
 table*.
 
diff --git a/spring-framework/assets/docs/06_PersistenceWithJPA.adoc b/spring-framework/assets/docs/06_PersistenceWithJPA.adoc
index 5bc283e..ddeebc1 100644
--- a/spring-framework/assets/docs/06_PersistenceWithJPA.adoc
+++ b/spring-framework/assets/docs/06_PersistenceWithJPA.adoc
@@ -28,24 +28,24 @@ This example demonstrates persistence with Hibernate.
 Look for `spring-jdbc`, `spring-orm`, `hibernate-core` and `hibernate-entitymanager` dependencies.
 
 . Application +
-⇒ link:../../ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/ColoredShapeApplication.java[ColoredShapeApplication.java] +
+⇒ link:../../ch06_spring-jpa/src/main/java/bny/training/spring/framework/ColoredShapeApplication.java[ColoredShapeApplication.java] +
 The class loads a Spring context through an `AnnotationConfigApplicationContext`.
 
 . *Config* - the class that specifies the component scanning instruction.
-⇒ link:../../ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java[ColoredShapeConfig.java] +
+⇒ link:../../ch06_spring-jpa/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java[ColoredShapeConfig.java] +
 The config class is supplied. This config class specifies the packages to be scanned for components.
-⇒ link:../../ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java[HibernateJPAConfig.java] +
+⇒ link:../../ch06_spring-jpa/src/main/java/bny/training/spring/framework/config/HibernateJPAConfig.java[HibernateJPAConfig.java] +
 The class that configures the HibernateEntityManager to connect to a database.
 
 . *Controller* layer +
-⇒ link:../../ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeControllingBean.java[ColoredShapeControllingBean.java] +
+⇒ link:../../ch06_spring-jpa/src/main/java/bny/training/spring/framework/controller/ColoredShapeControllingBean.java[ColoredShapeControllingBean.java] +
 The class auto-wires a `ColoredShapeService` interface, the Spring context has a
 `ColoredShapeServiceImpl` that will be used as an auto-wired instance (remember the *Liskov
 Substitution Principle*). The controller invokes the service methods to persist and retrieve
 ColoredShape instances. The class is marked with a `@Component` annotation.
 
 . *Service* layer +
-⇒ link:../../ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java[ColoredShapeServiceImpl.java] +
+⇒ link:../../ch06_spring-jpa/src/main/java/bny/training/spring/framework/service/ColoredShapeServiceImpl.java[ColoredShapeServiceImpl.java] +
 The class is marked with a `@Service` annotation. The `@Service` is an alias for the
 `@Component`annotation (see the code). It should display a
 `@AliasFor(annotation = Component.class)`. The service implementation auto-wires a
@@ -53,7 +53,7 @@ The class is marked with a `@Service` annotation. The `@Service` is an alias for
 Methods in the service delegate to methods in the DAO.
 
 . *DAO* layer +
-⇒ link:../../ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImpl.java[ColoredShapeDaoImpl.java] +
+⇒ link:../../ch06_spring-jpa/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImpl.java[ColoredShapeDaoImpl.java] +
 The class is marked with a `@Repository` annotation. The `@Repository` annotation is an alias for
 the `@Component` annotation. It too should have a `@AliasFor(annotation = Component.class)`. The
 DAO implementation uses an instance of the `SessionFactory` to communicate with the database.
diff --git a/spring-framework/assets/docs/07_PersistenceWithSpringDataJPA.adoc b/spring-framework/assets/docs/07_PersistenceWithSpringDataJPA.adoc
index 6f1ed5e..1c8dda4 100644
--- a/spring-framework/assets/docs/07_PersistenceWithSpringDataJPA.adoc
+++ b/spring-framework/assets/docs/07_PersistenceWithSpringDataJPA.adoc
@@ -28,20 +28,20 @@ This example demonstrates persistence with Hibernate and Spring Data JPA
 There are new dependencies introduced. Look for `spring-data-jpa` in the `pom.xml`.
 
 . *Config* - the class that specifies the component scanning instruction. +
-⇒ link:../../ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java[ColoredShapeConfig.java] +
+⇒ link:../../ch06_spring-jpa/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java[ColoredShapeConfig.java] +
 The config class is supplied. This config class specifies the packages to be scanned for components. +
-⇒ link:../../ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java[HibernateJPAConfig.java] +
+⇒ link:../../ch06_spring-jpa/src/main/java/bny/training/spring/framework/config/HibernateJPAConfig.java[HibernateJPAConfig.java] +
 The class that configures the HibernateEntityManager to connect to a database.
 
 . *Controller* layer +
-⇒ link:../../ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeControllingBean.java[ColoredShapeControllingBean.java] +
+⇒ link:../../ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/controller/ColoredShapeControllingBean.java[ColoredShapeControllingBean.java] +
 The class auto-wires a `ColoredShapeService` interface, the Spring context has a
 `ColoredShapeServiceImpl` that will be used as an auto-wired instance (remember the *Liskov
 Substitution Principle*). The controller invokes the service methods to persist and retrieve
 ColoredShape instances. The class is marked with a `@Component` annotation.
 
 . *Service* layer +
-⇒ link:../../ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java[ColoredShapeServiceImpl.java] +
+⇒ link:../../ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/service/ColoredShapeServiceImpl.java[ColoredShapeServiceImpl.java] +
 The class is marked with a `@Service` annotation. The `@Service` is an alias for the `@Component`
 annotation (see the code). It should display a `@AliasFor(annotation = Component.class)`. The
 service implementation auto-wires a `ColoredShapeDao` interface and will access the
@@ -49,7 +49,7 @@ service implementation auto-wires a `ColoredShapeDao` interface and will access
 DAO.
 
 . *DAO* layer +
-⇒ link:../../ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java[ColoredShapeDao.java] +
+⇒ link:../../ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java[ColoredShapeDao.java] +
 Notice the *_magic_* that no implementation was coded. Spring Data JPA _"figures out"_ the
 implementations from the method signature. The method signatures can get complex with *AND* and
 *OR* clauses. For instance, a valid method: `findOneByColorOrShape(String color, String shape)`.
diff --git a/spring-framework/ch01_spring-inversion-of-control/pom.xml b/spring-framework/ch01_spring-inversion-of-control/pom.xml
index 3021773..ddd76fb 100644
--- a/spring-framework/ch01_spring-inversion-of-control/pom.xml
+++ b/spring-framework/ch01_spring-inversion-of-control/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2021 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 
     <!-- G-A-V coordinates for our application build artifact -->
     <parent>
-        <groupId>bnymellon.training.spring.framework</groupId>
+        <groupId>bny.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
         <version>2.0.0</version>
     </parent>
diff --git a/spring-framework/ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex00_NoFrameworkExample.java b/spring-framework/ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex00_NoFrameworkExample.java
similarity index 88%
rename from spring-framework/ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex00_NoFrameworkExample.java
rename to spring-framework/ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex00_NoFrameworkExample.java
index 53b094c..dd17d83 100644
--- a/spring-framework/ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex00_NoFrameworkExample.java
+++ b/spring-framework/ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex00_NoFrameworkExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.model.ColoredShape;
 
 public class Ex00_NoFrameworkExample {
 
diff --git a/spring-framework/ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex01_InstantiationThroughConstructor.java b/spring-framework/ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex01_InstantiationThroughConstructor.java
similarity index 88%
rename from spring-framework/ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex01_InstantiationThroughConstructor.java
rename to spring-framework/ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex01_InstantiationThroughConstructor.java
index 3ce19d5..8522472 100644
--- a/spring-framework/ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex01_InstantiationThroughConstructor.java
+++ b/spring-framework/ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex01_InstantiationThroughConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
+import bny.training.spring.framework.model.ColoredShape;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
-
 public class Ex01_InstantiationThroughConstructor {
     public static void main(String args[]) {
 
diff --git a/spring-framework/ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex02_InstantiationThroughStaticFactory.java b/spring-framework/ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex02_InstantiationThroughStaticFactory.java
similarity index 90%
rename from spring-framework/ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex02_InstantiationThroughStaticFactory.java
rename to spring-framework/ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex02_InstantiationThroughStaticFactory.java
index b56142e..0042030 100644
--- a/spring-framework/ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex02_InstantiationThroughStaticFactory.java
+++ b/spring-framework/ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex02_InstantiationThroughStaticFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.model.ColoredShape;
 
 public class Ex02_InstantiationThroughStaticFactory {
 
diff --git a/spring-framework/ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex03_InstantiationThroughInstanceFactory.java b/spring-framework/ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex03_InstantiationThroughInstanceFactory.java
similarity index 90%
rename from spring-framework/ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex03_InstantiationThroughInstanceFactory.java
rename to spring-framework/ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex03_InstantiationThroughInstanceFactory.java
index 0bc372a..030d8d4 100644
--- a/spring-framework/ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/Ex03_InstantiationThroughInstanceFactory.java
+++ b/spring-framework/ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/Ex03_InstantiationThroughInstanceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
+import bny.training.spring.framework.model.ColoredShape;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
-
 public class Ex03_InstantiationThroughInstanceFactory {
 
     public Ex03_InstantiationThroughInstanceFactory() {
diff --git a/spring-framework/ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java b/spring-framework/ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/model/ColoredShape.java
similarity index 93%
rename from spring-framework/ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
rename to spring-framework/ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/model/ColoredShape.java
index 221c6fc..0005428 100644
--- a/spring-framework/ch01_spring-inversion-of-control/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
+++ b/spring-framework/ch01_spring-inversion-of-control/src/main/java/bny/training/spring/framework/model/ColoredShape.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 
 // A Spring bean
diff --git a/spring-framework/ch01_spring-inversion-of-control/src/main/resources/ex01-instantiation-through-constructor.xml b/spring-framework/ch01_spring-inversion-of-control/src/main/resources/ex01-instantiation-through-constructor.xml
index 7fed3bb..962abe2 100644
--- a/spring-framework/ch01_spring-inversion-of-control/src/main/resources/ex01-instantiation-through-constructor.xml
+++ b/spring-framework/ch01_spring-inversion-of-control/src/main/resources/ex01-instantiation-through-constructor.xml
@@ -19,7 +19,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
 	http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
-    <bean id="coloredShapeBean" class="bnymellon.training.spring.framework.model.ColoredShape">
+    <bean id="coloredShapeBean" class="bny.training.spring.framework.model.ColoredShape">
     </bean>
 
 </beans>
\ No newline at end of file
diff --git a/spring-framework/ch01_spring-inversion-of-control/src/main/resources/ex02-instantiation-through-static-factory.xml b/spring-framework/ch01_spring-inversion-of-control/src/main/resources/ex02-instantiation-through-static-factory.xml
index 6db2c8c..824a21c 100644
--- a/spring-framework/ch01_spring-inversion-of-control/src/main/resources/ex02-instantiation-through-static-factory.xml
+++ b/spring-framework/ch01_spring-inversion-of-control/src/main/resources/ex02-instantiation-through-static-factory.xml
@@ -20,6 +20,6 @@
 	http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
     <bean id="coloredShapeBean"
-          class="bnymellon.training.spring.framework.Ex02_InstantiationThroughStaticFactory"
+          class="bny.training.spring.framework.Ex02_InstantiationThroughStaticFactory"
           factory-method="getInstance"/>
 </beans>
\ No newline at end of file
diff --git a/spring-framework/ch01_spring-inversion-of-control/src/main/resources/ex03-instantiation-through-instance-factory.xml b/spring-framework/ch01_spring-inversion-of-control/src/main/resources/ex03-instantiation-through-instance-factory.xml
index 3c32d03..de01fc5 100644
--- a/spring-framework/ch01_spring-inversion-of-control/src/main/resources/ex03-instantiation-through-instance-factory.xml
+++ b/spring-framework/ch01_spring-inversion-of-control/src/main/resources/ex03-instantiation-through-instance-factory.xml
@@ -20,7 +20,7 @@
 	http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
     <!-- the factory bean, which contains a method called createInstance() -->
-    <bean id="instanceFactory" class="bnymellon.training.spring.framework.Ex03_InstantiationThroughInstanceFactory">
+    <bean id="instanceFactory" class="bny.training.spring.framework.Ex03_InstantiationThroughInstanceFactory">
         <!-- inject any dependencies required by this locator bean -->
     </bean>
 
diff --git a/spring-framework/ch01_spring-inversion-of-control/src/test/java/bnymellon/training/spring/framework/Lab01Test.java b/spring-framework/ch01_spring-inversion-of-control/src/test/java/bny/training/spring/framework/Lab01Test.java
similarity index 92%
rename from spring-framework/ch01_spring-inversion-of-control/src/test/java/bnymellon/training/spring/framework/Lab01Test.java
rename to spring-framework/ch01_spring-inversion-of-control/src/test/java/bny/training/spring/framework/Lab01Test.java
index cdd34f1..7df6a49 100644
--- a/spring-framework/ch01_spring-inversion-of-control/src/test/java/bnymellon/training/spring/framework/Lab01Test.java
+++ b/spring-framework/ch01_spring-inversion-of-control/src/test/java/bny/training/spring/framework/Lab01Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
-import bnymellon.training.spring.framework.model.Vehicle;
+import bny.training.spring.framework.model.VehicleFactory;
+import bny.training.spring.framework.model.Vehicle;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.MethodOrderer;
@@ -29,8 +30,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
- * @see bnymellon.training.spring.framework.model.Vehicle
- * @see bnymellon.training.spring.framework.model.VehicleFactory
+ * @see Vehicle
+ * @see VehicleFactory
  */
 @DisplayName("Inversion of Control using: ")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
diff --git a/spring-framework/ch01_spring-inversion-of-control/src/test/java/bnymellon/training/spring/framework/model/Vehicle.java b/spring-framework/ch01_spring-inversion-of-control/src/test/java/bny/training/spring/framework/model/Vehicle.java
similarity index 92%
rename from spring-framework/ch01_spring-inversion-of-control/src/test/java/bnymellon/training/spring/framework/model/Vehicle.java
rename to spring-framework/ch01_spring-inversion-of-control/src/test/java/bny/training/spring/framework/model/Vehicle.java
index f148a3f..9801bf3 100644
--- a/spring-framework/ch01_spring-inversion-of-control/src/test/java/bnymellon/training/spring/framework/model/Vehicle.java
+++ b/spring-framework/ch01_spring-inversion-of-control/src/test/java/bny/training/spring/framework/model/Vehicle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 public class Vehicle {
 
diff --git a/spring-framework/ch01_spring-inversion-of-control/src/test/java/bnymellon/training/spring/framework/model/VehicleFactory.java b/spring-framework/ch01_spring-inversion-of-control/src/test/java/bny/training/spring/framework/model/VehicleFactory.java
similarity index 89%
rename from spring-framework/ch01_spring-inversion-of-control/src/test/java/bnymellon/training/spring/framework/model/VehicleFactory.java
rename to spring-framework/ch01_spring-inversion-of-control/src/test/java/bny/training/spring/framework/model/VehicleFactory.java
index ce81706..8728046 100644
--- a/spring-framework/ch01_spring-inversion-of-control/src/test/java/bnymellon/training/spring/framework/model/VehicleFactory.java
+++ b/spring-framework/ch01_spring-inversion-of-control/src/test/java/bny/training/spring/framework/model/VehicleFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 // Add a static factory and an instance factory here.
 public class VehicleFactory {
diff --git a/spring-framework/ch02_spring-dependency-injection/pom.xml b/spring-framework/ch02_spring-dependency-injection/pom.xml
index 7263d95..83fcfca 100644
--- a/spring-framework/ch02_spring-dependency-injection/pom.xml
+++ b/spring-framework/ch02_spring-dependency-injection/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2021 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
     <!-- G-A-V coordinates for our application build artifact -->
     <parent>
-        <groupId>bnymellon.training.spring.framework</groupId>
+        <groupId>bny.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
         <version>2.0.0</version>
     </parent>
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/Ex00_NoFrameworkExample.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/Ex00_NoFrameworkExample.java
similarity index 86%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/Ex00_NoFrameworkExample.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/Ex00_NoFrameworkExample.java
index 800d501..fd2f701 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/Ex00_NoFrameworkExample.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/Ex00_NoFrameworkExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
-import bnymellon.training.spring.framework.model.ColoredShapeHolder;
-import bnymellon.training.spring.framework.model.CyanCylinder;
-import bnymellon.training.spring.framework.model.RedRectangle;
+import bny.training.spring.framework.model.ColoredShapeHolder;
+import bny.training.spring.framework.model.RedRectangle;
+import bny.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.model.CyanCylinder;
 
 public class Ex00_NoFrameworkExample {
 
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/annotation/Ex05_DIThroughAnnotationSetters.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/annotation/Ex05_DIThroughAnnotationSetters.java
similarity index 85%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/annotation/Ex05_DIThroughAnnotationSetters.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/annotation/Ex05_DIThroughAnnotationSetters.java
index 2574bcd..8f1fa4c 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/annotation/Ex05_DIThroughAnnotationSetters.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/annotation/Ex05_DIThroughAnnotationSetters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.annotation;
+package bny.training.spring.framework.annotation;
 
+import bny.training.spring.framework.model.SetterAnnotatedColoredShapeHolder;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import bnymellon.training.spring.framework.model.SetterAnnotatedColoredShapeHolder;
-
 public class Ex05_DIThroughAnnotationSetters {
 
     public static void main(String[] args) {
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/annotation/Ex06_DIThroughAnnotationConstructor.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/annotation/Ex06_DIThroughAnnotationConstructor.java
similarity index 86%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/annotation/Ex06_DIThroughAnnotationConstructor.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/annotation/Ex06_DIThroughAnnotationConstructor.java
index bb7e79b..81de6f2 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/annotation/Ex06_DIThroughAnnotationConstructor.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/annotation/Ex06_DIThroughAnnotationConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.annotation;
+package bny.training.spring.framework.annotation;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import bnymellon.training.spring.framework.model.ConstructorAnnotatedColoredShapeHolder;
+import bny.training.spring.framework.model.ConstructorAnnotatedColoredShapeHolder;
 
 public class Ex06_DIThroughAnnotationConstructor {
 
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/annotation/Ex07_DIThroughAnnotationWithQualifiers.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/annotation/Ex07_DIThroughAnnotationWithQualifiers.java
similarity index 86%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/annotation/Ex07_DIThroughAnnotationWithQualifiers.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/annotation/Ex07_DIThroughAnnotationWithQualifiers.java
index 7ee6312..1448144 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/annotation/Ex07_DIThroughAnnotationWithQualifiers.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/annotation/Ex07_DIThroughAnnotationWithQualifiers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.annotation;
+package bny.training.spring.framework.annotation;
 
+import bny.training.spring.framework.model.ConstructorAnnotatedQualifiedColoredShapeHolder;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import bnymellon.training.spring.framework.model.ConstructorAnnotatedQualifiedColoredShapeHolder;
-
 public class Ex07_DIThroughAnnotationWithQualifiers {
 
     public static void main(String[] args) {
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/java/Ex08_DIThroughJava.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/java/Ex08_DIThroughJava.java
similarity index 84%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/java/Ex08_DIThroughJava.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/java/Ex08_DIThroughJava.java
index 39add08..bded203 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/java/Ex08_DIThroughJava.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/java/Ex08_DIThroughJava.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.java;
+package bny.training.spring.framework.java;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 
-import bnymellon.training.spring.framework.model.AutowiredColoredShapeHolder;
+import bny.training.spring.framework.model.AutowiredColoredShapeHolder;
 
-@ComponentScan(basePackages = {"bnymellon.training.spring.framework.model"})
+@ComponentScan(basePackages = {"bny.training.spring.framework.model"})
 public class Ex08_DIThroughJava {
 
     @Autowired
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/java/Ex09_DIThroughJavaConfiguration.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/java/Ex09_DIThroughJavaConfiguration.java
similarity index 78%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/java/Ex09_DIThroughJavaConfiguration.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/java/Ex09_DIThroughJavaConfiguration.java
index 428270a..8f48233 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/java/Ex09_DIThroughJavaConfiguration.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/java/Ex09_DIThroughJavaConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.java;
+package bny.training.spring.framework.java;
 
+import bny.training.spring.framework.model.ColoredShapeHolder;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 
-import bnymellon.training.spring.framework.model.ColoredShapeHolder;
-import bnymellon.training.spring.framework.model.DIConfiguration;
+import bny.training.spring.framework.model.DIConfiguration;
 
-@ComponentScan(basePackages = {"bnymellon.training.spring.framework.model"})
+@ComponentScan(basePackages = {"bny.training.spring.framework.model"})
 public class Ex09_DIThroughJavaConfiguration {
 
     public static void main(String[] args) {
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/AutowiredColoredShapeHolder.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/AutowiredColoredShapeHolder.java
similarity index 95%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/AutowiredColoredShapeHolder.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/AutowiredColoredShapeHolder.java
index 2992579..9590b9b 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/AutowiredColoredShapeHolder.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/AutowiredColoredShapeHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/BlackBox.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/BlackBox.java
similarity index 88%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/BlackBox.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/BlackBox.java
index 3b12d7a..95570b4 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/BlackBox.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/BlackBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ColoredShape.java
similarity index 93%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ColoredShape.java
index edcf21e..f894b83 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ColoredShape.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 
 // A Spring bean
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ColoredShapeHolder.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ColoredShapeHolder.java
similarity index 93%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ColoredShapeHolder.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ColoredShapeHolder.java
index 5a74087..e561e4b 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ColoredShapeHolder.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ColoredShapeHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 public class ColoredShapeHolder {
 
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ConstructorAnnotatedColoredShapeHolder.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ConstructorAnnotatedColoredShapeHolder.java
similarity index 95%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ConstructorAnnotatedColoredShapeHolder.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ConstructorAnnotatedColoredShapeHolder.java
index 228d361..962efb6 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ConstructorAnnotatedColoredShapeHolder.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ConstructorAnnotatedColoredShapeHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ConstructorAnnotatedQualifiedColoredShapeHolder.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ConstructorAnnotatedQualifiedColoredShapeHolder.java
similarity index 95%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ConstructorAnnotatedQualifiedColoredShapeHolder.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ConstructorAnnotatedQualifiedColoredShapeHolder.java
index b7b970a..8ea8cf2 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/ConstructorAnnotatedQualifiedColoredShapeHolder.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/ConstructorAnnotatedQualifiedColoredShapeHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/CyanCylinder.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/CyanCylinder.java
similarity index 87%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/CyanCylinder.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/CyanCylinder.java
index 186c7b9..0d1491c 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/CyanCylinder.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/CyanCylinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 public class CyanCylinder extends ColoredShape {
 
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/DIConfiguration.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/DIConfiguration.java
similarity index 92%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/DIConfiguration.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/DIConfiguration.java
index 484b2ef..7a7c624 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/DIConfiguration.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/DIConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/OrangeOval.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/OrangeOval.java
similarity index 89%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/OrangeOval.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/OrangeOval.java
index a67d68a..1d7c776 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/OrangeOval.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/OrangeOval.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/RedRectangle.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/RedRectangle.java
similarity index 87%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/RedRectangle.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/RedRectangle.java
index 9408fe3..cd75fe7 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/RedRectangle.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/RedRectangle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 public class RedRectangle extends ColoredShape {
 
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/SetterAnnotatedColoredShapeHolder.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/SetterAnnotatedColoredShapeHolder.java
similarity index 94%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/SetterAnnotatedColoredShapeHolder.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/SetterAnnotatedColoredShapeHolder.java
index ffe8941..35afadb 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/model/SetterAnnotatedColoredShapeHolder.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/model/SetterAnnotatedColoredShapeHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex01_DIThroughConstructorSimple.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex01_DIThroughConstructorSimple.java
similarity index 87%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex01_DIThroughConstructorSimple.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex01_DIThroughConstructorSimple.java
index 2863e75..38f8752 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex01_DIThroughConstructorSimple.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex01_DIThroughConstructorSimple.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.xml;
+package bny.training.spring.framework.xml;
 
+import bny.training.spring.framework.model.ColoredShapeHolder;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import bnymellon.training.spring.framework.model.ColoredShapeHolder;
-
 public class Ex01_DIThroughConstructorSimple {
 
     public static void main(String args[]) {
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex02_DIThroughConstructorNamed.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex02_DIThroughConstructorNamed.java
similarity index 87%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex02_DIThroughConstructorNamed.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex02_DIThroughConstructorNamed.java
index 13b1ba3..9b8a65a 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex02_DIThroughConstructorNamed.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex02_DIThroughConstructorNamed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.xml;
+package bny.training.spring.framework.xml;
 
+import bny.training.spring.framework.model.ColoredShapeHolder;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import bnymellon.training.spring.framework.model.ColoredShapeHolder;
-
 public class Ex02_DIThroughConstructorNamed {
 
     public static void main(String args[]) {
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex03_DIThroughConstructorIndex.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex03_DIThroughConstructorIndex.java
similarity index 87%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex03_DIThroughConstructorIndex.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex03_DIThroughConstructorIndex.java
index efc917b..4a9dc42 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex03_DIThroughConstructorIndex.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex03_DIThroughConstructorIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.xml;
+package bny.training.spring.framework.xml;
 
+import bny.training.spring.framework.model.ColoredShapeHolder;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import bnymellon.training.spring.framework.model.ColoredShapeHolder;
-
 public class Ex03_DIThroughConstructorIndex {
 
     public static void main(String args[]) {
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex04_DIThroughSetters.java b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex04_DIThroughSetters.java
similarity index 86%
rename from spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex04_DIThroughSetters.java
rename to spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex04_DIThroughSetters.java
index 617a288..57eeb33 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/java/bnymellon/training/spring/framework/xml/Ex04_DIThroughSetters.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/java/bny/training/spring/framework/xml/Ex04_DIThroughSetters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.xml;
+package bny.training.spring.framework.xml;
 
+import bny.training.spring.framework.model.ColoredShapeHolder;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import bnymellon.training.spring.framework.model.ColoredShapeHolder;
-
 public class Ex04_DIThroughSetters {
 
     public static void main(String args[]) {
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex01-di-through-constructor-simple.xml b/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex01-di-through-constructor-simple.xml
index 1b9b220..37b7edd 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex01-di-through-constructor-simple.xml
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex01-di-through-constructor-simple.xml
@@ -20,10 +20,10 @@
 	http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
     <!-- Define a default Colored shape (green circle) -->
-    <bean id="coloredShapeBean" class="bnymellon.training.spring.framework.model.ColoredShape"/>
+    <bean id="coloredShapeBean" class="bny.training.spring.framework.model.ColoredShape"/>
 
     <!-- INJECT the default bean into the ColoredShapeHolder -->
-    <bean id="coloredShapeHolder" class="bnymellon.training.spring.framework.model.ColoredShapeHolder">
+    <bean id="coloredShapeHolder" class="bny.training.spring.framework.model.ColoredShapeHolder">
 
         <!-- The bean was created above, so we simply "referred" to it. -->
         <constructor-arg>
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex02-di-through-constructor-named.xml b/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex02-di-through-constructor-named.xml
index d5573f0..d02b904 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex02-di-through-constructor-named.xml
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex02-di-through-constructor-named.xml
@@ -20,7 +20,7 @@
 	http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
     <!-- Define a "red rectangle" shape (named constructor arguments) -->
-    <bean id="redRectangleBean" class="bnymellon.training.spring.framework.model.ColoredShape">
+    <bean id="redRectangleBean" class="bny.training.spring.framework.model.ColoredShape">
 
         <!-- note the "name" attribute -->
         <constructor-arg name="color" value="red"/>
@@ -28,7 +28,7 @@
     </bean>
 
     <!-- INJECT the bean into the ColoredShapeHolder -->
-    <bean id="coloredShapeHolder" class="bnymellon.training.spring.framework.model.ColoredShapeHolder">
+    <bean id="coloredShapeHolder" class="bny.training.spring.framework.model.ColoredShapeHolder">
 
         <!-- Revisit the previous exercise to see that this example uses a shorter reference style -->
         <constructor-arg name="coloredShape" ref="redRectangleBean"/>
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex03-di-through-constructor-index.xml b/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex03-di-through-constructor-index.xml
index b26e4e0..3d61cf4 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex03-di-through-constructor-index.xml
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex03-di-through-constructor-index.xml
@@ -20,7 +20,7 @@
 	http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
     <!-- Define a "cyan cylinder" shape (indexed constructor arguments) -->
-    <bean id="cyanCylinderBean" class="bnymellon.training.spring.framework.model.ColoredShape">
+    <bean id="cyanCylinderBean" class="bny.training.spring.framework.model.ColoredShape">
 
         <!-- note the "index" attribute -->
         <constructor-arg index="0" value="cyan"/>
@@ -28,7 +28,7 @@
     </bean>
 
     <!-- INJECT the bean into the ColoredShapeHolder -->
-    <bean id="coloredShapeHolder" class="bnymellon.training.spring.framework.model.ColoredShapeHolder">
+    <bean id="coloredShapeHolder" class="bny.training.spring.framework.model.ColoredShapeHolder">
 
         <constructor-arg index="0" ref="cyanCylinderBean"/>
 
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex04-di-through-setters.xml b/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex04-di-through-setters.xml
index 983c3c4..c136463 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex04-di-through-setters.xml
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex04-di-through-setters.xml
@@ -20,7 +20,7 @@
 	http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
 
     <!-- Define a "black box" shape -->
-    <bean id="blackBoxBean" class="bnymellon.training.spring.framework.model.ColoredShape">
+    <bean id="blackBoxBean" class="bny.training.spring.framework.model.ColoredShape">
 
         <!-- note the "property" entity -->
         <property name="color" value="black"/>
@@ -28,7 +28,7 @@
     </bean>
 
     <!-- INJECT the bean into the ColoredShapeHolder -->
-    <bean id="coloredShapeHolder" class="bnymellon.training.spring.framework.model.ColoredShapeHolder">
+    <bean id="coloredShapeHolder" class="bny.training.spring.framework.model.ColoredShapeHolder">
 
         <property name="coloredShape" ref="blackBoxBean"/>
         <property name="quantity" value="3"/>
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex05-di-through-annotation-setters.xml b/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex05-di-through-annotation-setters.xml
index 53e2705..b4cd856 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex05-di-through-annotation-setters.xml
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex05-di-through-annotation-setters.xml
@@ -31,7 +31,7 @@
 
 
     <!-- Define a "red rhombus" shape -->
-    <bean id="redRhombusBean" class="bnymellon.training.spring.framework.model.ColoredShape">
+    <bean id="redRhombusBean" class="bny.training.spring.framework.model.ColoredShape">
 
         <!-- note the "property" entity -->
         <property name="color" value="red"/>
@@ -39,7 +39,7 @@
     </bean>
 
     <!-- INJECT the bean into the ColoredShapeHolder -->
-    <bean id="setterAnnotatedColoredShapeHolder" class="bnymellon.training.spring.framework.model.SetterAnnotatedColoredShapeHolder">
+    <bean id="setterAnnotatedColoredShapeHolder" class="bny.training.spring.framework.model.SetterAnnotatedColoredShapeHolder">
 
         <!-- Notice the lack of referring to the ColoredShape in this bean -->
 
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex06-di-through-annotation-constructor.xml b/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex06-di-through-annotation-constructor.xml
index 58df20a..7872a69 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex06-di-through-annotation-constructor.xml
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex06-di-through-annotation-constructor.xml
@@ -26,7 +26,7 @@
     <context:annotation-config/>
 
     <!-- Define a "orange oval" shape -->
-    <bean id="orangeOvalBean" class="bnymellon.training.spring.framework.model.ColoredShape">
+    <bean id="orangeOvalBean" class="bny.training.spring.framework.model.ColoredShape">
 
         <!-- note the "property" entity, it does not matter what we use: properties or constructors, here-->
         <property name="color" value="orange"/>
@@ -34,7 +34,7 @@
     </bean>
 
     <!-- INJECT the bean into the ColoredShapeHolder -->
-    <bean id="constructorAnnotatedColoredShapeHolder" class="bnymellon.training.spring.framework.model.ConstructorAnnotatedColoredShapeHolder">
+    <bean id="constructorAnnotatedColoredShapeHolder" class="bny.training.spring.framework.model.ConstructorAnnotatedColoredShapeHolder">
 
         <!-- Notice the lack of referring to the ColoredShape in this bean -->
 
diff --git a/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex07-di-through-annotation-with-qualifiers.xml b/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex07-di-through-annotation-with-qualifiers.xml
index 926f428..bbd2a4d 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex07-di-through-annotation-with-qualifiers.xml
+++ b/spring-framework/ch02_spring-dependency-injection/src/main/resources/ex07-di-through-annotation-with-qualifiers.xml
@@ -26,7 +26,7 @@
     <context:annotation-config/>
 
     <!-- Define a "orange oval" shape -->
-    <bean id="orangeOvalBean" class="bnymellon.training.spring.framework.model.ColoredShape">
+    <bean id="orangeOvalBean" class="bny.training.spring.framework.model.ColoredShape">
 
         <!-- Notice the new qualifier -->
         <qualifier value="aColoredShape"/>
@@ -37,7 +37,7 @@
     </bean>
 
     <!-- Define a "pink polygon" shape -->
-    <bean id="pinkPolygonBean" class="bnymellon.training.spring.framework.model.ColoredShape">
+    <bean id="pinkPolygonBean" class="bny.training.spring.framework.model.ColoredShape">
 
         <!-- Notice the new qualifier -->
         <qualifier value="thePinkPolygon"/>
@@ -48,7 +48,7 @@
     </bean>
 
     <!-- INJECT the bean into the ColoredShapeHolder -->
-    <bean id="constructorAnnotatedQualifiedColoredShapeHolder" class="bnymellon.training.spring.framework.model.ConstructorAnnotatedQualifiedColoredShapeHolder">
+    <bean id="constructorAnnotatedQualifiedColoredShapeHolder" class="bny.training.spring.framework.model.ConstructorAnnotatedQualifiedColoredShapeHolder">
 
         <!-- Notice the lack of referring to the ColoredShape in this bean -->
 
diff --git a/spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/annotation/Lab02Test.java b/spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/annotation/Lab02Test.java
similarity index 90%
rename from spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/annotation/Lab02Test.java
rename to spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/annotation/Lab02Test.java
index 2bc6470..3de4a2b 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/annotation/Lab02Test.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/annotation/Lab02Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,8 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.annotation;
+package bny.training.spring.framework.annotation;
 
-import bnymellon.training.spring.framework.model.ConstructorAnnotatedBulkVehicleOrder;
-import bnymellon.training.spring.framework.model.ConstructorAnnotatedWithQualifierBulkVehicleOrder;
-import bnymellon.training.spring.framework.model.SetterAnnotatedBulkVehicleOrder;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.ApplicationContext;
@@ -26,7 +23,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-// Refer to the bnymellon.training.spring.framework.annotation package in the examples.
+// Refer to the bny.training.spring.framework.annotation package in the examples.
 public class Lab02Test {
     
     private ApplicationContext context;
diff --git a/spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/model/ConstructorAnnotatedBulkVehicleOrder.java b/spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/model/ConstructorAnnotatedBulkVehicleOrder.java
similarity index 93%
rename from spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/model/ConstructorAnnotatedBulkVehicleOrder.java
rename to spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/model/ConstructorAnnotatedBulkVehicleOrder.java
index 77ea2f6..b4f304a 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/model/ConstructorAnnotatedBulkVehicleOrder.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/model/ConstructorAnnotatedBulkVehicleOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 // TODO: Fix this class to Autowire using a constructor
 public class ConstructorAnnotatedBulkVehicleOrder {
diff --git a/spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/model/ConstructorAnnotatedWithQualifierBulkVehicleOrder.java b/spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/model/ConstructorAnnotatedWithQualifierBulkVehicleOrder.java
similarity index 94%
rename from spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/model/ConstructorAnnotatedWithQualifierBulkVehicleOrder.java
rename to spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/model/ConstructorAnnotatedWithQualifierBulkVehicleOrder.java
index 50736fe..5c9a5d8 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/model/ConstructorAnnotatedWithQualifierBulkVehicleOrder.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/model/ConstructorAnnotatedWithQualifierBulkVehicleOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 // TODO: Fix this class to Autowire using a constructor
 public class ConstructorAnnotatedWithQualifierBulkVehicleOrder {
diff --git a/spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/model/SetterAnnotatedBulkVehicleOrder.java b/spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/model/SetterAnnotatedBulkVehicleOrder.java
similarity index 93%
rename from spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/model/SetterAnnotatedBulkVehicleOrder.java
rename to spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/model/SetterAnnotatedBulkVehicleOrder.java
index 1eda102..adcfaae 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/model/SetterAnnotatedBulkVehicleOrder.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/model/SetterAnnotatedBulkVehicleOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 // TODO: Fix this class to Autowire using a setter
 public class SetterAnnotatedBulkVehicleOrder {
diff --git a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/model/Vehicle.java b/spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/model/Vehicle.java
similarity index 92%
rename from spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/model/Vehicle.java
rename to spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/model/Vehicle.java
index ffcc2de..8d91f1e 100644
--- a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/model/Vehicle.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/model/Vehicle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 public class Vehicle {
 
diff --git a/spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/xml/Lab01Test.java b/spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/xml/Lab01Test.java
similarity index 93%
rename from spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/xml/Lab01Test.java
rename to spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/xml/Lab01Test.java
index 85f348e..4c1db53 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/xml/Lab01Test.java
+++ b/spring-framework/ch02_spring-dependency-injection/src/test/java/bny/training/spring/framework/xml/Lab01Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.xml;
+package bny.training.spring.framework.xml;
 
-import bnymellon.training.spring.framework.model.Vehicle;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.ApplicationContext;
@@ -25,7 +24,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
-// Refer to the bnymellon.training.spring.framework.xml package in the examples.
+// Refer to the bny.training.spring.framework.xml package in the examples.
 public class Lab01Test {
 
     private ApplicationContext context;
diff --git a/spring-framework/ch03_spring-testing/pom.xml b/spring-framework/ch03_spring-testing/pom.xml
index 09f6fba..541ea43 100644
--- a/spring-framework/ch03_spring-testing/pom.xml
+++ b/spring-framework/ch03_spring-testing/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2021 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
     <!-- G-A-V coordinates for our application build artifact -->
     <parent>
-        <groupId>bnymellon.training.spring.framework</groupId>
+        <groupId>bny.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
         <version>2.0.0</version>
     </parent>
diff --git a/spring-framework/ch03_spring-testing/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java b/spring-framework/ch03_spring-testing/src/main/java/bny/training/spring/framework/model/ColoredShape.java
similarity index 93%
rename from spring-framework/ch03_spring-testing/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
rename to spring-framework/ch03_spring-testing/src/main/java/bny/training/spring/framework/model/ColoredShape.java
index 444c99d..3925b01 100644
--- a/spring-framework/ch03_spring-testing/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
+++ b/spring-framework/ch03_spring-testing/src/main/java/bny/training/spring/framework/model/ColoredShape.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 
 import org.springframework.stereotype.Component;
diff --git a/spring-framework/ch03_spring-testing/src/main/java/bnymellon/training/spring/framework/model/ColoredShapeHolder.java b/spring-framework/ch03_spring-testing/src/main/java/bny/training/spring/framework/model/ColoredShapeHolder.java
similarity index 93%
rename from spring-framework/ch03_spring-testing/src/main/java/bnymellon/training/spring/framework/model/ColoredShapeHolder.java
rename to spring-framework/ch03_spring-testing/src/main/java/bny/training/spring/framework/model/ColoredShapeHolder.java
index 74e3c13..ef4be14 100644
--- a/spring-framework/ch03_spring-testing/src/main/java/bnymellon/training/spring/framework/model/ColoredShapeHolder.java
+++ b/spring-framework/ch03_spring-testing/src/main/java/bny/training/spring/framework/model/ColoredShapeHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 import org.springframework.stereotype.Component;
 
diff --git a/spring-framework/ch03_spring-testing/src/main/java/bnymellon/training/spring/framework/model/DIConfiguration.java b/spring-framework/ch03_spring-testing/src/main/java/bny/training/spring/framework/model/DIConfiguration.java
similarity index 90%
rename from spring-framework/ch03_spring-testing/src/main/java/bnymellon/training/spring/framework/model/DIConfiguration.java
rename to spring-framework/ch03_spring-testing/src/main/java/bny/training/spring/framework/model/DIConfiguration.java
index 4d8227b..c260857 100644
--- a/spring-framework/ch03_spring-testing/src/main/java/bnymellon/training/spring/framework/model/DIConfiguration.java
+++ b/spring-framework/ch03_spring-testing/src/main/java/bny/training/spring/framework/model/DIConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
@@ -23,7 +23,7 @@
 
 @Configuration
 //CoponentScan is optional and only required if there are other components that depend on, or are depended by this configuration.
-@ComponentScan(basePackages = {"bnymellon.training.spring.framework"})
+@ComponentScan(basePackages = {"bny.training.spring.framework"})
 public class DIConfiguration {
 
     @Bean(name = "tealTrapezoid")
diff --git a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Ex01_DefaultXMLContextConfiguration.java b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Ex01_DefaultXMLContextConfiguration.java
similarity index 90%
rename from spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Ex01_DefaultXMLContextConfiguration.java
rename to spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Ex01_DefaultXMLContextConfiguration.java
index e216289..69175e7 100644
--- a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Ex01_DefaultXMLContextConfiguration.java
+++ b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Ex01_DefaultXMLContextConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
-import bnymellon.training.spring.framework.model.ColoredShapeHolder;
+import bny.training.spring.framework.model.ColoredShapeHolder;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Ex02_CustomXMLContextConfiguration.java b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Ex02_CustomXMLContextConfiguration.java
similarity index 90%
rename from spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Ex02_CustomXMLContextConfiguration.java
rename to spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Ex02_CustomXMLContextConfiguration.java
index 8f352ce..c35c7f0 100644
--- a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Ex02_CustomXMLContextConfiguration.java
+++ b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Ex02_CustomXMLContextConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -22,7 +22,7 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import bnymellon.training.spring.framework.model.ColoredShapeHolder;
+import bny.training.spring.framework.model.ColoredShapeHolder;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Ex03_JavaContextConfiguration.java b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Ex03_JavaContextConfiguration.java
similarity index 90%
rename from spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Ex03_JavaContextConfiguration.java
rename to spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Ex03_JavaContextConfiguration.java
index 41e0dd2..06123bc 100644
--- a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Ex03_JavaContextConfiguration.java
+++ b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Ex03_JavaContextConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -23,8 +23,8 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import bnymellon.training.spring.framework.model.ColoredShapeHolder;
-import bnymellon.training.spring.framework.model.DIConfiguration;
+import bny.training.spring.framework.model.ColoredShapeHolder;
+import bny.training.spring.framework.model.DIConfiguration;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Lab01Test.java b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Lab01Test.java
similarity index 86%
rename from spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Lab01Test.java
rename to spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Lab01Test.java
index 5b04229..ae14de0 100644
--- a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Lab01Test.java
+++ b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Lab01Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import bnymellon.training.spring.framework.model.BulkVehicleOrder;
-
-import static org.springframework.test.util.AssertionErrors.assertEquals;
+import bny.training.spring.framework.model.BulkVehicleOrder;
 
 //TODO: Run this test with the right runner.
 //TODO: Use default XML context configuration to configure an order of 10 count of 2017 car.
diff --git a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Lab02Test.java b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Lab02Test.java
similarity index 90%
rename from spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Lab02Test.java
rename to spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Lab02Test.java
index b7ebe1b..bf8a226 100644
--- a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Lab02Test.java
+++ b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Lab02Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
+import bny.training.spring.framework.model.BulkVehicleOrder;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import bnymellon.training.spring.framework.model.BulkVehicleOrder;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
diff --git a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Lab03Test.java b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Lab03Test.java
similarity index 93%
rename from spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Lab03Test.java
rename to spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Lab03Test.java
index 0ef71e7..e7f46fd 100644
--- a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/Lab03Test.java
+++ b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/Lab03Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
+import bny.training.spring.framework.model.BulkVehicleOrder;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 
-import bnymellon.training.spring.framework.model.BulkVehicleOrder;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 //TODO: Run this test with the right runner.
diff --git a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/model/BulkVehicleOrder.java b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/model/BulkVehicleOrder.java
similarity index 93%
rename from spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/model/BulkVehicleOrder.java
rename to spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/model/BulkVehicleOrder.java
index 6f099cc..f0d8f7c 100644
--- a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/model/BulkVehicleOrder.java
+++ b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/model/BulkVehicleOrder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 // TODO: Fix this class to Autowire using a setter
 public class BulkVehicleOrder {
diff --git a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/model/Lab03DIConfiguration.java b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/model/Lab03DIConfiguration.java
similarity index 88%
rename from spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/model/Lab03DIConfiguration.java
rename to spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/model/Lab03DIConfiguration.java
index ce888d4..d2b4082 100644
--- a/spring-framework/ch03_spring-testing/src/test/java/bnymellon/training/spring/framework/model/Lab03DIConfiguration.java
+++ b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/model/Lab03DIConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 //TODO: Ensure that this Configuration is stereotyped.
 public class Lab03DIConfiguration {
diff --git a/spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/model/Vehicle.java b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/model/Vehicle.java
similarity index 92%
rename from spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/model/Vehicle.java
rename to spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/model/Vehicle.java
index ffcc2de..8d91f1e 100644
--- a/spring-framework/ch02_spring-dependency-injection/src/test/java/bnymellon/training/spring/framework/model/Vehicle.java
+++ b/spring-framework/ch03_spring-testing/src/test/java/bny/training/spring/framework/model/Vehicle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 public class Vehicle {
 
diff --git a/spring-framework/ch03_spring-testing/src/test/resources/bnymellon/training/spring/framework/Ex01_DefaultXMLContextConfiguration-context.xml b/spring-framework/ch03_spring-testing/src/test/resources/bnymellon/training/spring/framework/Ex01_DefaultXMLContextConfiguration-context.xml
index e92c9d8..243c9d3 100644
--- a/spring-framework/ch03_spring-testing/src/test/resources/bnymellon/training/spring/framework/Ex01_DefaultXMLContextConfiguration-context.xml
+++ b/spring-framework/ch03_spring-testing/src/test/resources/bnymellon/training/spring/framework/Ex01_DefaultXMLContextConfiguration-context.xml
@@ -26,14 +26,14 @@
     <context:annotation-config/>
 
     <!-- Define a "orange oval" shape -->
-    <bean id="orangeOvalBean" class="bnymellon.training.spring.framework.model.ColoredShape">
+    <bean id="orangeOvalBean" class="bny.training.spring.framework.model.ColoredShape">
 
         <property name="color" value="orange"/>
         <property name="type" value="oval"/>
     </bean>
 
     <!-- INJECT the bean into the ColoredShapeHolder -->
-    <bean id="coloredShapeHolder" class="bnymellon.training.spring.framework.model.ColoredShapeHolder">
+    <bean id="coloredShapeHolder" class="bny.training.spring.framework.model.ColoredShapeHolder">
 
         <property name="coloredShape" ref="orangeOvalBean"/>
         <property name="quantity" value="2"/>
diff --git a/spring-framework/ch03_spring-testing/src/test/resources/ex02.xml b/spring-framework/ch03_spring-testing/src/test/resources/ex02.xml
index f35b60d..acbae88 100644
--- a/spring-framework/ch03_spring-testing/src/test/resources/ex02.xml
+++ b/spring-framework/ch03_spring-testing/src/test/resources/ex02.xml
@@ -26,14 +26,14 @@
     <context:annotation-config/>
 
     <!-- Define a "red rhombus" shape -->
-    <bean id="redRhombusBean" class="bnymellon.training.spring.framework.model.ColoredShape">
+    <bean id="redRhombusBean" class="bny.training.spring.framework.model.ColoredShape">
 
         <property name="color" value="red"/>
         <property name="type" value="rhombus"/>
     </bean>
 
     <!-- INJECT the bean into the ColoredShapeHolder -->
-    <bean id="coloredShapeHolder" class="bnymellon.training.spring.framework.model.ColoredShapeHolder">
+    <bean id="coloredShapeHolder" class="bny.training.spring.framework.model.ColoredShapeHolder">
 
         <property name="coloredShape" ref="redRhombusBean"/>
         <property name="quantity" value="5"/>
diff --git a/spring-framework/ch04_spring-persistence/pom.xml b/spring-framework/ch04_spring-persistence/pom.xml
index 82b1128..f306327 100644
--- a/spring-framework/ch04_spring-persistence/pom.xml
+++ b/spring-framework/ch04_spring-persistence/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2021 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
     <!-- G-A-V coordinates for our application build artifact -->
     <parent>
-        <groupId>bnymellon.training.spring.framework</groupId>
+        <groupId>bny.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
         <version>2.0.0</version>
     </parent>
diff --git a/spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/Ex01_DB_XMLConfigured.java b/spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/Ex01_DB_XMLConfigured.java
similarity index 88%
rename from spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/Ex01_DB_XMLConfigured.java
rename to spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/Ex01_DB_XMLConfigured.java
index 4244867..a714d3e 100644
--- a/spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/Ex01_DB_XMLConfigured.java
+++ b/spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/Ex01_DB_XMLConfigured.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
 import java.util.List;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-import bnymellon.training.spring.framework.dao.ColoredShapeDao;
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.dao.ColoredShapeDao;
+import bny.training.spring.framework.model.ColoredShape;
 
 public class Ex01_DB_XMLConfigured {
 
diff --git a/spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/Ex02_DB_JavaConfigured.java b/spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/Ex02_DB_JavaConfigured.java
similarity index 84%
rename from spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/Ex02_DB_JavaConfigured.java
rename to spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/Ex02_DB_JavaConfigured.java
index 8d920f8..abae3ea 100644
--- a/spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/Ex02_DB_JavaConfigured.java
+++ b/spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/Ex02_DB_JavaConfigured.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
 import java.util.List;
 
+import bny.training.spring.framework.dao.ColoredShapeDao;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 
-import bnymellon.training.spring.framework.dao.ColoredShapeDao;
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.model.ColoredShape;
 
-@ComponentScan(basePackages = {"bnymellon.training.spring.framework.model", "bnymellon.training.spring.framework.dao"})
+@ComponentScan(basePackages = {"bny.training.spring.framework.model", "bny.training.spring.framework.dao"})
 public class Ex02_DB_JavaConfigured {
 
     public static void main(String[] args) {
diff --git a/spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java b/spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java
similarity index 88%
rename from spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java
rename to spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java
index ac11a65..d9bc0fb 100644
--- a/spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java
+++ b/spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.dao;
+package bny.training.spring.framework.dao;
 
 import java.util.List;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.model.ColoredShape;
 
 public interface ColoredShapeDao {
 
diff --git a/spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImplEx01.java b/spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImplEx01.java
similarity index 94%
rename from spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImplEx01.java
rename to spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImplEx01.java
index 604275c..9481814 100644
--- a/spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImplEx01.java
+++ b/spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImplEx01.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.dao;
+package bny.training.spring.framework.dao;
 
 import javax.sql.DataSource;
 import java.sql.ResultSet;
@@ -24,7 +24,7 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.model.ColoredShape;
 
 public class ColoredShapeDaoImplEx01 implements ColoredShapeDao {
 
diff --git a/spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImplEx02.java b/spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImplEx02.java
similarity index 95%
rename from spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImplEx02.java
rename to spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImplEx02.java
index 9e02f2a..1be5133 100644
--- a/spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImplEx02.java
+++ b/spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImplEx02.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.dao;
+package bny.training.spring.framework.dao;
 
 import javax.sql.DataSource;
 import java.sql.ResultSet;
@@ -26,7 +26,7 @@
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Repository;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.model.ColoredShape;
 
 @Repository
 public class ColoredShapeDaoImplEx02 implements ColoredShapeDao {
diff --git a/spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java b/spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/model/ColoredShape.java
similarity index 94%
rename from spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
rename to spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/model/ColoredShape.java
index 478af78..4eaabb7 100644
--- a/spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
+++ b/spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/model/ColoredShape.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 
 import org.springframework.stereotype.Component;
diff --git a/spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/model/DBConfiguration.java b/spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/model/DBConfiguration.java
similarity index 93%
rename from spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/model/DBConfiguration.java
rename to spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/model/DBConfiguration.java
index 636012e..4ee3d06 100644
--- a/spring-framework/ch04_spring-persistence/src/main/java/bnymellon/training/spring/framework/model/DBConfiguration.java
+++ b/spring-framework/ch04_spring-persistence/src/main/java/bny/training/spring/framework/model/DBConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 import javax.sql.DataSource;
 
diff --git a/spring-framework/ch04_spring-persistence/src/main/resources/spring-config.xml b/spring-framework/ch04_spring-persistence/src/main/resources/spring-config.xml
index 9311bf1..da13be0 100644
--- a/spring-framework/ch04_spring-persistence/src/main/resources/spring-config.xml
+++ b/spring-framework/ch04_spring-persistence/src/main/resources/spring-config.xml
@@ -27,14 +27,14 @@
 
     <!-- "hint" at available annotations -->
     <context:annotation-config/>
-    <context:component-scan base-package="bnymellon.training.spring.framework"/>
+    <context:component-scan base-package="bny.training.spring.framework"/>
 
     <jdbc:embedded-database id="dataSource" type="H2">
         <jdbc:script location="classpath:db/sql/create-tables.sql" />
         <jdbc:script location="classpath:db/sql/insert-data.sql" />
     </jdbc:embedded-database>
 
-    <bean id="coloredShapeDao" class="bnymellon.training.spring.framework.dao.ColoredShapeDaoImplEx01" >
+    <bean id="coloredShapeDao" class="bny.training.spring.framework.dao.ColoredShapeDaoImplEx01" >
         <constructor-arg ref="dataSource" />
     </bean>
 
diff --git a/spring-framework/ch05_spring-hibernate/pom.xml b/spring-framework/ch05_spring-hibernate/pom.xml
index 7c824da..cc6eb40 100644
--- a/spring-framework/ch05_spring-hibernate/pom.xml
+++ b/spring-framework/ch05_spring-hibernate/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2021 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
     <!-- G-A-V coordinates for our application build artifact -->
     <parent>
-        <groupId>bnymellon.training.spring.framework</groupId>
+        <groupId>bny.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
         <version>2.0.0</version>
     </parent>
diff --git a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/ColoredShapeApplication.java b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/ColoredShapeApplication.java
similarity index 81%
rename from spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/ColoredShapeApplication.java
rename to spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/ColoredShapeApplication.java
index 4a4dd36..6f5091f 100644
--- a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/ColoredShapeApplication.java
+++ b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/ColoredShapeApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
+import bny.training.spring.framework.config.ColoredShapeConfig;
+import bny.training.spring.framework.controller.ColoredShapeControllingBean;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-import bnymellon.training.spring.framework.config.ColoredShapeConfig;
-import bnymellon.training.spring.framework.controller.ColoredShapeControllingBean;
-
 public class ColoredShapeApplication {
 
     public static void main(String[] args) {
diff --git a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java
similarity index 82%
rename from spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java
rename to spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java
index 45331a7..dcd4ebf 100644
--- a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java
+++ b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.config;
+package bny.training.spring.framework.config;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan(value={"bnymellon.training.spring.framework"})
+@ComponentScan(value={"bny.training.spring.framework"})
 public class ColoredShapeConfig {
 }
\ No newline at end of file
diff --git a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/config/HibernateSessionConfig.java b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/config/HibernateSessionConfig.java
similarity index 95%
rename from spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/config/HibernateSessionConfig.java
rename to spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/config/HibernateSessionConfig.java
index 41e0b67..f869e2d 100644
--- a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/config/HibernateSessionConfig.java
+++ b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/config/HibernateSessionConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.config;
+package bny.training.spring.framework.config;
 
 import javax.sql.DataSource;
 import java.util.Properties;
@@ -100,7 +100,7 @@ public LocalSessionFactoryBean getSessionFactory() {
 
         sessionFactory.setDataSource(getDataSource());
         sessionFactory.setPackagesToScan(
-                new String[] { "bnymellon.training.spring.framework.model" });
+                new String[] { "bny.training.spring.framework.model" });
         sessionFactory.setHibernateProperties(getHibernateProperties());
 
         return sessionFactory;
diff --git a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeControllingBean.java b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/controller/ColoredShapeControllingBean.java
similarity index 89%
rename from spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeControllingBean.java
rename to spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/controller/ColoredShapeControllingBean.java
index d365106..6dea764 100644
--- a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeControllingBean.java
+++ b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/controller/ColoredShapeControllingBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.controller;
+package bny.training.spring.framework.controller;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
-import bnymellon.training.spring.framework.service.ColoredShapeService;
+import bny.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.service.ColoredShapeService;
 
 @Component
 public class ColoredShapeControllingBean {
diff --git a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java
similarity index 81%
rename from spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java
rename to spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java
index 0c6bd50..2f5a6b0 100644
--- a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java
+++ b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.dao;
+package bny.training.spring.framework.dao;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.model.ColoredShape;
 
 public interface ColoredShapeDao {
 
diff --git a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImpl.java b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImpl.java
similarity index 90%
rename from spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImpl.java
rename to spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImpl.java
index 33c3424..cf84a67 100644
--- a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImpl.java
+++ b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.dao;
+package bny.training.spring.framework.dao;
 
+import bny.training.spring.framework.model.ColoredShape;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,8 +24,6 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
-
 @Repository
 @Transactional(readOnly = true)
 public class ColoredShapeDaoImpl implements ColoredShapeDao {
diff --git a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/model/ColoredShape.java
similarity index 96%
rename from spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
rename to spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/model/ColoredShape.java
index 8d432ce..fa5f871 100644
--- a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
+++ b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/model/ColoredShape.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 
 import jakarta.persistence.Column;
diff --git a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeService.java b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/service/ColoredShapeService.java
similarity index 81%
rename from spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeService.java
rename to spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/service/ColoredShapeService.java
index b19fc38..221fb4a 100644
--- a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeService.java
+++ b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/service/ColoredShapeService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.service;
+package bny.training.spring.framework.service;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.model.ColoredShape;
 
 public interface ColoredShapeService {
 
diff --git a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/service/ColoredShapeServiceImpl.java
similarity index 84%
rename from spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java
rename to spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/service/ColoredShapeServiceImpl.java
index 1f41db6..e0c45ff 100644
--- a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java
+++ b/spring-framework/ch05_spring-hibernate/src/main/java/bny/training/spring/framework/service/ColoredShapeServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.service;
+package bny.training.spring.framework.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import bnymellon.training.spring.framework.dao.ColoredShapeDao;
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.dao.ColoredShapeDao;
+import bny.training.spring.framework.model.ColoredShape;
 
 @Service
 @Transactional(readOnly = true)
diff --git a/spring-framework/ch05_spring-hibernate/src/main/resources/logback.xml b/spring-framework/ch05_spring-hibernate/src/main/resources/logback.xml
index 99efda5..bb8f410 100644
--- a/spring-framework/ch05_spring-hibernate/src/main/resources/logback.xml
+++ b/spring-framework/ch05_spring-hibernate/src/main/resources/logback.xml
@@ -27,7 +27,7 @@
     </appender>
 
 
-    <logger name="bnymellon.training.spring" additivity="false">
+    <logger name="bny.training.spring" additivity="false">
         <level value="DEBUG" />
         <appender-ref ref="consoleAppender" />
     </logger>
diff --git a/spring-framework/ch06_spring-jpa/pom.xml b/spring-framework/ch06_spring-jpa/pom.xml
index 4370589..0f3b0ea 100644
--- a/spring-framework/ch06_spring-jpa/pom.xml
+++ b/spring-framework/ch06_spring-jpa/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2021 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
     <!-- G-A-V coordinates for our application build artifact -->
     <parent>
-        <groupId>bnymellon.training.spring.framework</groupId>
+        <groupId>bny.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
         <version>2.0.0</version>
     </parent>
diff --git a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/ColoredShapeApplication.java b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/ColoredShapeApplication.java
similarity index 81%
rename from spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/ColoredShapeApplication.java
rename to spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/ColoredShapeApplication.java
index 4a4dd36..d472679 100644
--- a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/ColoredShapeApplication.java
+++ b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/ColoredShapeApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
+import bny.training.spring.framework.config.ColoredShapeConfig;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-import bnymellon.training.spring.framework.config.ColoredShapeConfig;
-import bnymellon.training.spring.framework.controller.ColoredShapeControllingBean;
+import bny.training.spring.framework.controller.ColoredShapeControllingBean;
 
 public class ColoredShapeApplication {
 
diff --git a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java
similarity index 82%
rename from spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java
rename to spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java
index 45331a7..dcd4ebf 100644
--- a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java
+++ b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.config;
+package bny.training.spring.framework.config;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan(value={"bnymellon.training.spring.framework"})
+@ComponentScan(value={"bny.training.spring.framework"})
 public class ColoredShapeConfig {
 }
\ No newline at end of file
diff --git a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/config/HibernateJPAConfig.java
similarity index 96%
rename from spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java
rename to spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/config/HibernateJPAConfig.java
index 5850a3f..6f75160 100644
--- a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java
+++ b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/config/HibernateJPAConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.config;
+package bny.training.spring.framework.config;
 
 import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
@@ -42,7 +42,7 @@ public class HibernateJPAConfig {
     private Environment env;
 
     private static final String[] ENTITY_PACKAGES = {
-            "bnymellon.training.spring.framework.model"
+            "bny.training.spring.framework.model"
     };
 
     @Autowired
diff --git a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeControllingBean.java b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/controller/ColoredShapeControllingBean.java
similarity index 90%
rename from spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeControllingBean.java
rename to spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/controller/ColoredShapeControllingBean.java
index 07a1930..22ec245 100644
--- a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeControllingBean.java
+++ b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/controller/ColoredShapeControllingBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.controller;
+package bny.training.spring.framework.controller;
 
+import bny.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.service.ColoredShapeService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
-import bnymellon.training.spring.framework.service.ColoredShapeService;
-
 @Component
 public class ColoredShapeControllingBean {
     private static final Logger LOGGER =
diff --git a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java
similarity index 81%
rename from spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java
rename to spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java
index 0c6bd50..2f5a6b0 100644
--- a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java
+++ b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.dao;
+package bny.training.spring.framework.dao;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.model.ColoredShape;
 
 public interface ColoredShapeDao {
 
diff --git a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImpl.java b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImpl.java
similarity index 90%
rename from spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImpl.java
rename to spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImpl.java
index 346a394..71b676d 100644
--- a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDaoImpl.java
+++ b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/dao/ColoredShapeDaoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.dao;
+package bny.training.spring.framework.dao;
 
+import bny.training.spring.framework.model.ColoredShape;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 
@@ -23,8 +24,6 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
-
 @Repository
 @Transactional(readOnly = true)
 public class ColoredShapeDaoImpl implements ColoredShapeDao {
diff --git a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/model/ColoredShape.java
similarity index 96%
rename from spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
rename to spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/model/ColoredShape.java
index 5e4b466..161f97c 100644
--- a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
+++ b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/model/ColoredShape.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeService.java b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/service/ColoredShapeService.java
similarity index 81%
rename from spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeService.java
rename to spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/service/ColoredShapeService.java
index b8a8ec9..caefcb3 100644
--- a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeService.java
+++ b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/service/ColoredShapeService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.service;
+package bny.training.spring.framework.service;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.model.ColoredShape;
 
 public interface ColoredShapeService {
 
diff --git a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/service/ColoredShapeServiceImpl.java
similarity index 84%
rename from spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java
rename to spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/service/ColoredShapeServiceImpl.java
index 5fa970f..237964a 100644
--- a/spring-framework/ch06_spring-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java
+++ b/spring-framework/ch06_spring-jpa/src/main/java/bny/training/spring/framework/service/ColoredShapeServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,14 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.service;
+package bny.training.spring.framework.service;
 
+import bny.training.spring.framework.dao.ColoredShapeDao;
+import bny.training.spring.framework.model.ColoredShape;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import bnymellon.training.spring.framework.dao.ColoredShapeDao;
-import bnymellon.training.spring.framework.model.ColoredShape;
-
 @Service
 @Transactional(readOnly = true)
 public class ColoredShapeServiceImpl implements ColoredShapeService {
diff --git a/spring-framework/ch06_spring-jpa/src/main/resources/logback.xml b/spring-framework/ch06_spring-jpa/src/main/resources/logback.xml
index 99efda5..bb8f410 100644
--- a/spring-framework/ch06_spring-jpa/src/main/resources/logback.xml
+++ b/spring-framework/ch06_spring-jpa/src/main/resources/logback.xml
@@ -27,7 +27,7 @@
     </appender>
 
 
-    <logger name="bnymellon.training.spring" additivity="false">
+    <logger name="bny.training.spring" additivity="false">
         <level value="DEBUG" />
         <appender-ref ref="consoleAppender" />
     </logger>
diff --git a/spring-framework/ch07_spring-data-jpa/pom.xml b/spring-framework/ch07_spring-data-jpa/pom.xml
index 745849d..6987fce 100644
--- a/spring-framework/ch07_spring-data-jpa/pom.xml
+++ b/spring-framework/ch07_spring-data-jpa/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2021 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
     <!-- G-A-V coordinates for our application build artifact -->
     <parent>
-        <groupId>bnymellon.training.spring.framework</groupId>
+        <groupId>bny.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
         <version>2.0.0</version>
     </parent>
diff --git a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/ColoredShapeApplication.java b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/ColoredShapeApplication.java
similarity index 81%
rename from spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/ColoredShapeApplication.java
rename to spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/ColoredShapeApplication.java
index 4a4dd36..a0488a2 100644
--- a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/ColoredShapeApplication.java
+++ b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/ColoredShapeApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-import bnymellon.training.spring.framework.config.ColoredShapeConfig;
-import bnymellon.training.spring.framework.controller.ColoredShapeControllingBean;
+import bny.training.spring.framework.config.ColoredShapeConfig;
+import bny.training.spring.framework.controller.ColoredShapeControllingBean;
 
 public class ColoredShapeApplication {
 
diff --git a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java
similarity index 82%
rename from spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java
rename to spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java
index 45331a7..dcd4ebf 100644
--- a/spring-framework/ch05_spring-hibernate/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java
+++ b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.config;
+package bny.training.spring.framework.config;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan(value={"bnymellon.training.spring.framework"})
+@ComponentScan(value={"bny.training.spring.framework"})
 public class ColoredShapeConfig {
 }
\ No newline at end of file
diff --git a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/config/HibernateJPAConfig.java
similarity index 95%
rename from spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java
rename to spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/config/HibernateJPAConfig.java
index 2bda2a1..e61d7e6 100644
--- a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java
+++ b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/config/HibernateJPAConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.config;
+package bny.training.spring.framework.config;
 
 import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
@@ -38,13 +38,13 @@
 @Configuration
 @EnableTransactionManagement
 @PropertySource(value = {"classpath:application.properties"})
-@EnableJpaRepositories(basePackages = {"bnymellon.training.spring.framework.dao"})
+@EnableJpaRepositories(basePackages = {"bny.training.spring.framework.dao"})
 public class HibernateJPAConfig {
 
     private Environment env;
 
     private static final String[] ENTITY_PACKAGES = {
-            "bnymellon.training.spring.framework.model"
+            "bny.training.spring.framework.model"
     };
 
     @Autowired
diff --git a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeControllingBean.java b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/controller/ColoredShapeControllingBean.java
similarity index 91%
rename from spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeControllingBean.java
rename to spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/controller/ColoredShapeControllingBean.java
index d13d8f8..bbf583d 100644
--- a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeControllingBean.java
+++ b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/controller/ColoredShapeControllingBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.controller;
+package bny.training.spring.framework.controller;
 
+import bny.training.spring.framework.model.ColoredShape;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
-import bnymellon.training.spring.framework.service.ColoredShapeService;
+import bny.training.spring.framework.service.ColoredShapeService;
 
 @Component
 public class ColoredShapeControllingBean {
diff --git a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java
similarity index 87%
rename from spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java
rename to spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java
index 0df97cf..bc7377e 100644
--- a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java
+++ b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.dao;
+package bny.training.spring.framework.dao;
 
 import org.springframework.data.repository.CrudRepository;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.model.ColoredShape;
 
 // No implementation !!! Only interface.
 
diff --git a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/model/ColoredShape.java
similarity index 96%
rename from spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
rename to spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/model/ColoredShape.java
index 6d1a16b..8062ae4 100644
--- a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
+++ b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/model/ColoredShape.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 
 import jakarta.persistence.Column;
diff --git a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeService.java b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/service/ColoredShapeService.java
similarity index 83%
rename from spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeService.java
rename to spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/service/ColoredShapeService.java
index f1a425b..0d22b57 100644
--- a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeService.java
+++ b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/service/ColoredShapeService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.service;
+package bny.training.spring.framework.service;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.model.ColoredShape;
 
 public interface ColoredShapeService {
 
diff --git a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/service/ColoredShapeServiceImpl.java
similarity index 87%
rename from spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java
rename to spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/service/ColoredShapeServiceImpl.java
index 5aa4f38..a3b3354 100644
--- a/spring-framework/ch07_spring-data-jpa/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java
+++ b/spring-framework/ch07_spring-data-jpa/src/main/java/bny/training/spring/framework/service/ColoredShapeServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Bank of New York Mellon.
+ * Copyright 2024 The Bank of New York Mellon.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,16 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.service;
+package bny.training.spring.framework.service;
 
 import java.util.Optional;
 
+import bny.training.spring.framework.dao.ColoredShapeDao;
+import bny.training.spring.framework.model.ColoredShape;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import bnymellon.training.spring.framework.dao.ColoredShapeDao;
-import bnymellon.training.spring.framework.model.ColoredShape;
-
 @Service
 @Transactional(readOnly = true)
 public class ColoredShapeServiceImpl implements ColoredShapeService {
diff --git a/spring-framework/ch07_spring-data-jpa/src/main/resources/logback.xml b/spring-framework/ch07_spring-data-jpa/src/main/resources/logback.xml
index 99efda5..bb8f410 100644
--- a/spring-framework/ch07_spring-data-jpa/src/main/resources/logback.xml
+++ b/spring-framework/ch07_spring-data-jpa/src/main/resources/logback.xml
@@ -27,7 +27,7 @@
     </appender>
 
 
-    <logger name="bnymellon.training.spring" additivity="false">
+    <logger name="bny.training.spring" additivity="false">
         <level value="DEBUG" />
         <appender-ref ref="consoleAppender" />
     </logger>
diff --git a/spring-framework/ch08_spring-rest/pom.xml b/spring-framework/ch08_spring-rest/pom.xml
index 04d2e8a..5db3893 100644
--- a/spring-framework/ch08_spring-rest/pom.xml
+++ b/spring-framework/ch08_spring-rest/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2021 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
     <!-- G-A-V coordinates for our application build artifact -->
     <parent>
-        <groupId>bnymellon.training.spring.framework</groupId>
+        <groupId>bny.training.spring.framework</groupId>
         <artifactId>spring-framework</artifactId>
         <version>2.0.0</version>
     </parent>
diff --git a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/ColoredShapeApplication.java b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/ColoredShapeApplication.java
similarity index 84%
rename from spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/ColoredShapeApplication.java
rename to spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/ColoredShapeApplication.java
index d949650..2a1eab0 100644
--- a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/ColoredShapeApplication.java
+++ b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/ColoredShapeApplication.java
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework;
+package bny.training.spring.framework;
 
+import bny.training.spring.framework.config.ColoredShapeConfig;
+import bny.training.spring.framework.controller.ColoredShapeController;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-import bnymellon.training.spring.framework.config.ColoredShapeConfig;
-import bnymellon.training.spring.framework.controller.ColoredShapeController;
-
 public class ColoredShapeApplication {
 
     public static void main(String[] args) {
diff --git a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java
similarity index 87%
rename from spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java
rename to spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java
index e255bd9..4c9e2b5 100644
--- a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/config/ColoredShapeConfig.java
+++ b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/config/ColoredShapeConfig.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.config;
+package bny.training.spring.framework.config;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@ComponentScan(value={"bnymellon.training.spring.framework"})
+@ComponentScan(value={"bny.training.spring.framework"})
 public class ColoredShapeConfig {
 }
diff --git a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/config/HibernateJPAConfig.java
similarity index 96%
rename from spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java
rename to spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/config/HibernateJPAConfig.java
index 288f81d..6b2f56d 100644
--- a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/config/HibernateJPAConfig.java
+++ b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/config/HibernateJPAConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.config;
+package bny.training.spring.framework.config;
 
 import jakarta.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
@@ -38,13 +38,13 @@
 @Configuration
 @EnableTransactionManagement
 @PropertySource(value = {"classpath:application.properties"})
-@EnableJpaRepositories(basePackages = {"bnymellon.training.spring.framework.dao"})
+@EnableJpaRepositories(basePackages = {"bny.training.spring.framework.dao"})
 public class HibernateJPAConfig {
 
     private Environment env;
 
     private static final String[] ENTITY_PACKAGES = {
-            "bnymellon.training.spring.framework.model"
+            "bny.training.spring.framework.model"
     };
 
     @Autowired
diff --git a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeController.java b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/controller/ColoredShapeController.java
similarity index 96%
rename from spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeController.java
rename to spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/controller/ColoredShapeController.java
index 0bea4a5..fd39d8d 100644
--- a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/controller/ColoredShapeController.java
+++ b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/controller/ColoredShapeController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.controller;
+package bny.training.spring.framework.controller;
 
 import java.util.List;
 
@@ -34,8 +34,8 @@
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
-import bnymellon.training.spring.framework.service.ColoredShapeService;
+import bny.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.service.ColoredShapeService;
 
 import static org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED_VALUE;
 import static org.springframework.util.MimeTypeUtils.APPLICATION_JSON_VALUE;
diff --git a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java
similarity index 90%
rename from spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java
rename to spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java
index 8704177..1bd0813 100644
--- a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/dao/ColoredShapeDao.java
+++ b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/dao/ColoredShapeDao.java
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.dao;
+package bny.training.spring.framework.dao;
 
+import bny.training.spring.framework.model.ColoredShape;
 import org.springframework.data.repository.CrudRepository;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
-
 // No implementation !!! Only interface.
 
 /**
diff --git a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/model/ColoredShape.java
similarity index 98%
rename from spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
rename to spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/model/ColoredShape.java
index 7b39f8c..a1ddeb6 100644
--- a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/model/ColoredShape.java
+++ b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/model/ColoredShape.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.model;
+package bny.training.spring.framework.model;
 
 
 import jakarta.persistence.Column;
diff --git a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeService.java b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/service/ColoredShapeService.java
similarity index 88%
rename from spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeService.java
rename to spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/service/ColoredShapeService.java
index fd8cabe..f98ec15 100644
--- a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeService.java
+++ b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/service/ColoredShapeService.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.service;
+package bny.training.spring.framework.service;
 
 import java.util.List;
 
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.model.ColoredShape;
 
 public interface ColoredShapeService {
 
diff --git a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/service/ColoredShapeServiceImpl.java
similarity index 91%
rename from spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java
rename to spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/service/ColoredShapeServiceImpl.java
index ce651bd..3f729e0 100644
--- a/spring-framework/ch08_spring-rest/src/main/java/bnymellon/training/spring/framework/service/ColoredShapeServiceImpl.java
+++ b/spring-framework/ch08_spring-rest/src/main/java/bny/training/spring/framework/service/ColoredShapeServiceImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bnymellon.training.spring.framework.service;
+package bny.training.spring.framework.service;
 
 import java.util.Collections;
 import java.util.List;
@@ -24,8 +24,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import bnymellon.training.spring.framework.dao.ColoredShapeDao;
-import bnymellon.training.spring.framework.model.ColoredShape;
+import bny.training.spring.framework.dao.ColoredShapeDao;
+import bny.training.spring.framework.model.ColoredShape;
 
 @Service
 @Transactional(readOnly = true)
diff --git a/spring-framework/ch08_spring-rest/src/main/resources/logback.xml b/spring-framework/ch08_spring-rest/src/main/resources/logback.xml
index 99efda5..bb8f410 100644
--- a/spring-framework/ch08_spring-rest/src/main/resources/logback.xml
+++ b/spring-framework/ch08_spring-rest/src/main/resources/logback.xml
@@ -27,7 +27,7 @@
     </appender>
 
 
-    <logger name="bnymellon.training.spring" additivity="false">
+    <logger name="bny.training.spring" additivity="false">
         <level value="DEBUG" />
         <appender-ref ref="consoleAppender" />
     </logger>
diff --git a/spring-framework/pom.xml b/spring-framework/pom.xml
index 6f89a1f..6c8e3ca 100644
--- a/spring-framework/pom.xml
+++ b/spring-framework/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2021 The Bank of New York Mellon.
+  ~ Copyright 2024 The Bank of New York Mellon.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <!-- G-A-V coordinates for our application build artifact -->
-    <groupId>bnymellon.training.spring.framework</groupId>
+    <groupId>bny.training.spring.framework</groupId>
     <artifactId>spring-framework</artifactId>
     <version>2.0.0</version>